updates

5 files changed, 69 insertions, 33 deletions

diff --git a/Makefile b/Makefile
index e2938a3d..9009178f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 3
 PATCHLEVEL = 4
 SUBLEVEL = 112
-EXTRAVERSION = .madmonkey
+EXTRAVERSION = .17-madmonkey
 NAME = Saber-toothed Squirrel
 
 # *DOCUMENTATION*
diff --git a/arch/arm/configs/sun_nontendocm_defconfig b/arch/arm/configs/sun_nontendocm_defconfig
index 38939677..58728f00 100644
--- a/arch/arm/configs/sun_nontendocm_defconfig
+++ b/arch/arm/configs/sun_nontendocm_defconfig
@@ -23,10 +23,7 @@ CONFIG_PROFILING=y
 CONFIG_OPROFILE=y
 CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
@@ -59,8 +56,7 @@ CONFIG_SCHED_SMT=y
 CONFIG_ARM_ARCH_TIMER=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
-CONFIG_HIGHPTE=y
+# CONFIG_OABI_COMPAT is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
 CONFIG_CMDLINE="earlyprintk=ttyS0,115200 loglevel=8 console=ttyS0,115200 init=/init "
@@ -96,11 +92,21 @@ CONFIG_INET_UDP_DIAG=y
 # CONFIG_ANDROID_PARANOID_NETWORK is not set
 CONFIG_NETWORK_PHY_TIMESTAMPING=y
 CONFIG_WAN_ROUTER=y
-# CONFIG_WIRELESS is not set
+CONFIG_BT=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_ATH3K=m
+CONFIG_CFG80211=m
+# CONFIG_CFG80211_DEFAULT_PS is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_LEDS=y
+CONFIG_RFKILL=y
 CONFIG_SUNXI_ARISC=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
+# CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_CMA=y
 CONFIG_SYNC=y
 CONFIG_SW_SYNC=y
@@ -110,6 +116,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=y
 CONFIG_BLK_DEV_NBD=y
 CONFIG_BLK_SUNXI_NAND=y
 CONFIG_SUNXI_BROM_READ=y
+CONFIG_AW_RF_PM=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
@@ -125,6 +132,7 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_SNAPSHOT=y
 CONFIG_DM_MIRROR=y
 CONFIG_NETDEVICES=y
+CONFIG_MII=y
 CONFIG_TUN=y
 # CONFIG_ETHERNET is not set
 CONFIG_PPP=y
@@ -132,25 +140,42 @@ CONFIG_PPP_BSDCOMP=y
 CONFIG_PPP_DEFLATE=y
 CONFIG_PPPOE=y
 CONFIG_PPP_ASYNC=y
-CONFIG_USB_USBNET=y
+CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_AX8817X is not set
 # CONFIG_USB_NET_QF9700 is not set
-CONFIG_USB_NET_CDC_EEM=y
+CONFIG_USB_NET_CDC_EEM=m
 # CONFIG_USB_NET_NET1080 is not set
+CONFIG_USB_NET_RNDIS_HOST=m
 # CONFIG_USB_BELKIN is not set
 # CONFIG_USB_ARMLINUX is not set
 # CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_WLAN is not set
+CONFIG_RTL8187=m
+CONFIG_WIFI_CONTROL_FUNC=y
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RTL8192CU=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8188EU=m
+CONFIG_RTL8812AU=m
 CONFIG_INPUT_POLLDEV=y
-# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1280
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=720
+CONFIG_INPUT_JOYDEV=y
 CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_KEYRESET=y
+# CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_SUNXI=m
-# CONFIG_INPUT_MOUSE is not set
+# CONFIG_MOUSE_PS2 is not set
 CONFIG_INPUT_JOYSTICK=y
 CONFIG_JOYSTICK_XPAD=y
 CONFIG_JOYSTICK_XPAD_FF=y
 CONFIG_JOYSTICK_XPAD_LEDS=y
-# CONFIG_SERIO_SERPORT is not set
+# CONFIG_SERIO is not set
+CONFIG_VT_HW_CONSOLE_BINDING=y
 CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
 CONFIG_LEGACY_PTY_COUNT=0
 # CONFIG_HW_RANDOM is not set
@@ -193,7 +218,6 @@ CONFIG_FB_SUNXI=y
 CONFIG_FB_CONSOLE_SUNXI=y
 CONFIG_LCD_SUNXI=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FONTS=y
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
@@ -210,6 +234,7 @@ CONFIG_SND_SUN8IW5_SNDCODEC=y
 CONFIG_SND_SUNXI_SWITCH=y
 CONFIG_SND_SUNXI_SOC_I2S1_INTERFACE=y
 CONFIG_HIDRAW=y
+CONFIG_HID_REMOTE_WAKEUP=y
 CONFIG_USB_HIDDEV=y
 CONFIG_HID_LOGITECH=y
 CONFIG_HID_LOGITECH_DJ=y
@@ -225,7 +250,6 @@ CONFIG_USB_SUNXI_HCD0=y
 CONFIG_USB_SUNXI_HCI=y
 CONFIG_USB_SUNXI_EHCI0=y
 CONFIG_USB_SUNXI_OHCI0=y
-CONFIG_USB_SUNXI_HACK=y
 CONFIG_SW_USB_3G=y
 CONFIG_USB_3G_SLEEP_BY_USB_WAKEUP_BY_USB=y
 CONFIG_USB_ACM=y
@@ -260,6 +284,7 @@ CONFIG_USB_G_ANDROID_RNDIS=y
 CONFIG_USB_SUNXI_USB=y
 CONFIG_USB_SUNXI_USB_MANAGER=y
 CONFIG_USB_SUNXI_USB0_OTG=y
+CONFIG_USB_SUNXI_HACK=y
 CONFIG_MMC=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -290,32 +315,30 @@ CONFIG_DEVFREQ_DRAM_FREQ_IN_VSYNC=y
 CONFIG_EXT4_FS=y
 # CONFIG_EXT4_FS_XATTR is not set
 CONFIG_FANOTIFY=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=y
-CONFIG_OVERLAYFS_FS=y
-CONFIG_FSCACHE=y
-CONFIG_CACHEFILES=y
-CONFIG_ISO9660_FS=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_FUSE_FS=m
+CONFIG_OVERLAYFS_FS=m
+CONFIG_FSCACHE=m
+CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
+CONFIG_UDF_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
 CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_CONFIGFS_FS=y
-CONFIG_CRAMFS=y
+CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_XATTR=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
 CONFIG_SQUASHFS_4K_DEVBLK_SIZE=y
-CONFIG_SQUASHFS_EMBEDDED=y
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
 CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
 CONFIG_NFS_FSCACHE=y
-CONFIG_CIFS=y
+CONFIG_CIFS=m
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_FSCACHE=y
 CONFIG_NLS_DEFAULT="UTF-8"
@@ -370,13 +393,18 @@ CONFIG_TIMER_STATS=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=20
 # CONFIG_RCU_CPU_STALL_VERBOSE is not set
 # CONFIG_FTRACE is not set
-CONFIG_STRICT_DEVMEM=y
 CONFIG_CRYPTO_USER=y
 CONFIG_CRYPTO_AUTHENC=y
+CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_DES=y
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_ZLIB=y
@@ -386,5 +414,6 @@ CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
 CONFIG_CRYPTO_SUNXI=m
+CONFIG_CRC_ITU_T=y
 CONFIG_LIBCRC32C=y
 CONFIG_MALI_LINUX_ENV=y
diff --git a/build_all.sh b/build_all.sh
index 04d7e784..b2deb25d 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -6,6 +6,8 @@ MAKE(){
 
 CROSS_COMPILE=arm-linux-gnueabihf-
 KDIR="$(pwd)"
+EXTRAVERSION=".$(git log --oneline | wc -l)-madmonkey"
+sed -i "s#EXTRAVERSION =.*#EXTRAVERSION = $EXTRAVERSION#" "$KDIR/Makefile"
 eval "$(head -n4 "$KDIR/Makefile" | sed 's#\s*=\s*#=#')"
 KVERS="$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION"
 instdir="$KDIR/modules-hmod"
@@ -18,6 +20,7 @@ make ARCH=arm "CROSS_COMPILE=$CROSS_COMPILE" xconfig || \
 make ARCH=arm "CROSS_COMPILE=$CROSS_COMPILE" menuconfig
 MAKE savedefconfig
 mv -f "defconfig" "arch/arm/configs/sun_nontendocm_defconfig"
+git diff "arch/arm/configs/sun_nontendocm_defconfig"
 MAKE dep
 MAKE zImage
 MAKE modules
@@ -34,15 +37,18 @@ rm -rf "$instdir"
 mkdir "$instdir"
 
 MAKE "INSTALL_MOD_PATH=$instdir" modules_install
+#MAKE "INSTALL_MOD_PATH=$instdir" firmware_install
 find "$instdir" -type l -delete
 
 mkdir "$instdir/lib/modules/$KVERS/extra"
 cp -f "modules/mali/mali.ko" "$instdir/lib/modules/$KVERS/extra/"
 cp -f "clovercon/clovercon.ko" "$instdir/lib/modules/$KVERS/extra/"
 
-echo "no-uninstall" > "$instdir/uninstall"
+echo "return 0" > "$instdir/uninstall"
+echo "no-uninstall" >> "$instdir/uninstall"
 
 find "$instdir" -type f -name "*.ko" -print0 | xargs -0 -n1 "${CROSS_COMPILE}strip" --strip-unneeded
+exit 0
 makepack "$instdir"
 rm -rf "$instdir"
 rm -f "modules-$KVERS.hmod"
diff --git a/drivers/block/nand/nfd/nand_blk.c b/drivers/block/nand/nfd/nand_blk.c
index 31727710..7a28cede 100644
--- a/drivers/block/nand/nfd/nand_blk.c
+++ b/drivers/block/nand/nfd/nand_blk.c
@@ -693,6 +693,7 @@ static int nand_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
         }
         return ret;
 
+    case hakchi_test:
     case phy_read:
     case phy_write:
     case read_boot0:
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 2520a6e2..190aa2b7 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -112,7 +112,7 @@ extern void warn_slowpath_null(const char *file, const int line);
 #endif
 
 #ifndef HAVE_ARCH_BUG_ON
-#define BUG_ON(condition) do { if (condition) ; } while(0)
+#define BUG_ON(condition) do { if (condition) {} } while(0)
 #endif
 
 #ifndef HAVE_ARCH_WARN_ON