Merge 2.1.2

2016-03-18 00:22:30 -05:00
parent fa0a9fc1a1
commit 9754c4eaef
45 changed files with 20777 additions and 191 deletions
--- a/banana-pi.sh
+++ b/banana-pi.sh
@@ -118,6 +118,9 @@ apt-get --yes --force-yes install $packages
 apt-get --yes --force-yes dist-upgrade
 apt-get --yes --force-yes autoremove

+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+update-rc.d ssh enable
+
 rm -f /usr/sbin/policy-rc.d
 rm -f /usr/sbin/invoke-rc.d
 dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
@@ -191,13 +194,13 @@ EOF
 # them in this section.
 # Get, compile and install kernel
 git clone --depth 1 https://github.com/LeMaker/u-boot-bananapi
-git clone --depth 1 https://github.com/linux-sunxi/linux-sunxi -b stage/sunxi-3.4 ${basedir}/root/usr/src/kernel
+git clone --depth 1 https://github.com/LeMaker/linux-sunxi -b lemaker-3.4 ${basedir}/root/usr/src/kernel
 git clone --depth 1 https://github.com/linux-sunxi/sunxi-tools
-git clone --depth 1 https://github.com/linux-sunxi/sunxi-boards
+git clone --depth 1 https://github.com/LeMaker/sunxi-boards

 cd ${basedir}/sunxi-tools
 make fex2bin
-./fex2bin ${basedir}/sunxi-boards/sys_config/a20/Bananapi.fex ${basedir}/bootp/script.bin
+./fex2bin ${basedir}/sunxi-boards/sys_config/a20/BananaPi.fex ${basedir}/bootp/script.bin

 cd ${basedir}/root/usr/src/kernel
 git rev-parse HEAD > ../kernel-at-commit
@@ -205,19 +208,26 @@ patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/mac80211.patch
 touch .scmversion
 export ARCH=arm
 export CROSS_COMPILE=arm-linux-gnueabihf-
-cp ${basedir}/../kernel-configs/sun7i.config .config
-cp ${basedir}/../kernel-configs/sun7i.config ../sun7i.config
+cp ${basedir}/../kernel-configs/lemaker.config .config
+cp ${basedir}/../kernel-configs/lemaker.config ../lemaker.config
 make -j $(grep -c processor /proc/cpuinfo) uImage modules
 make modules_install INSTALL_MOD_PATH=${basedir}/root
+make modules_install INSTALL_MOD_PATH=${basedir}/root
+rm -rf ${basedir}/root/lib/firmware
+cd ${basedir}/root/lib/
+git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
+rm -rf ${basedir}/root/lib/firmware/.git
+cd ${basedir}/root/usr/src/kernel/
+make INSTALL_MOD_PATH=${basedir}/root firmware_install
 cp arch/arm/boot/uImage ${basedir}/bootp
 make mrproper
-cp ../sun7i.config .config
+cp ../lemaker.config .config
 make modules_prepare
 cd ${basedir}

 # Create boot.txt file
 cat << EOF > ${basedir}/bootp/boot.cmd
-setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra}
+setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra} rw rootfstype=ext4 net.ifnames=0
 fatload mmc 0 0x43000000 script.bin
 fatload mmc 0 0x48000000 uImage
 bootm 0x48000000
--- a/banana-pro.sh
+++ b/banana-pro.sh
@@ -0,0 +1,275 @@
+#!/bin/bash
+
+if [[ $# -eq 0 ]] ; then
+    echo "Please pass version number, e.g. $0 2.0"
+    exit 0
+fi
+
+basedir=`pwd`/bananapro-$1
+
+# Make sure that the cross compiler can be found in the path before we do
+# anything else, that way the builds don't fail half way through.
+export CROSS_COMPILE=arm-linux-gnueabihf-
+if [ $(compgen -c $CROSS_COMPILE | wc -l) -eq 0 ] ; then
+    echo "Missing cross compiler. Set up PATH according to the README"
+    exit 1
+fi
+# Unset CROSS_COMPILE so that if there is any native compiling needed it doesn't
+# get cross compiled.
+unset CROSS_COMPILE
+
+# Package installations for various sections.
+# This will build a minimal XFCE Kali system with the top 10 tools.
+# This is the section to edit if you would like to add more packages.
+# See http://www.kali.org/new/kali-linux-metapackages/ for meta packages you can
+# use. You can also install packages, using just the package name, but keep in
+# mind that not all packages work on ARM! If you specify one of those, the
+# script will throw an error, but will still continue on, and create an unusable
+# image, keep that in mind.
+
+arm="abootimg cgpt fake-hwclock ntpdate u-boot-tools vboot-utils vboot-kernel-utils"
+base="e2fsprogs initramfs-tools kali-defaults kali-menu parted sudo usbutils"
+desktop="fonts-croscore fonts-crosextra-caladea fonts-crosextra-carlito gnome-theme-kali gtk3-engines-xfce kali-desktop-xfce kali-root-login lightdm network-manager network-manager-gnome xfce4 xserver-xorg-video-fbdev"
+tools="aircrack-ng ethtool hydra john libnfc-bin mfoc nmap passing-the-hash sqlmap usbutils winexe wireshark"
+services="apache2 openssh-server"
+extras="iceweasel xfce4-terminal wpasupplicant"
+
+packages="${arm} ${base} ${desktop} ${tools} ${services} ${extras}"
+architecture="armhf"
+# If you have your own preferred mirrors, set them here.
+# You may want to leave security.kali.org alone, but if you trust your local
+# mirror, feel free to change this as well.
+# After generating the rootfs, we set the sources.list to the default settings.
+mirror=http.kali.org
+
+# Set this to use an http proxy, like apt-cacher-ng, and uncomment further down
+# to unset it.
+#export http_proxy="http://localhost:3142/"
+
+mkdir -p ${basedir}
+cd ${basedir}
+
+# create the rootfs - not much to modify here, except maybe the hostname.
+debootstrap --foreign --arch $architecture kali-rolling kali-$architecture http://$mirror/kali
+
+cp /usr/bin/qemu-arm-static kali-$architecture/usr/bin/
+
+LANG=C chroot kali-$architecture /debootstrap/debootstrap --second-stage
+cat << EOF > kali-$architecture/etc/apt/sources.list
+deb http://$mirror/kali kali-rolling main contrib non-free
+EOF
+
+echo "kali" > kali-$architecture/etc/hostname
+
+cat << EOF > kali-$architecture/etc/hosts
+127.0.0.1       kali    localhost
+::1             localhost ip6-localhost ip6-loopback
+fe00::0         ip6-localnet
+ff00::0         ip6-mcastprefix
+ff02::1         ip6-allnodes
+ff02::2         ip6-allrouters
+EOF
+
+cat << EOF > kali-$architecture/etc/network/interfaces
+auto lo
+iface lo inet loopback
+
+auto eth0
+iface eth0 inet dhcp
+EOF
+
+cat << EOF > kali-$architecture/etc/resolv.conf
+nameserver 8.8.8.8
+EOF
+
+export MALLOC_CHECK_=0 # workaround for LP: #520465
+export LC_ALL=C
+export DEBIAN_FRONTEND=noninteractive
+
+mount -t proc proc kali-$architecture/proc
+mount -o bind /dev/ kali-$architecture/dev/
+mount -o bind /dev/pts kali-$architecture/dev/pts
+
+cat << EOF > kali-$architecture/debconf.set
+console-common console-data/keymap/policy select Select keymap from full list
+console-common console-data/keymap/full select en-latin1-nodeadkeys
+EOF
+
+cat << EOF > kali-$architecture/third-stage
+#!/bin/bash
+dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
+cp /bin/true /usr/sbin/invoke-rc.d
+echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
+chmod +x /usr/sbin/policy-rc.d
+
+apt-get update
+apt-get --yes --force-yes install locales-all
+
+debconf-set-selections /debconf.set
+rm -f /debconf.set
+apt-get update
+apt-get -y install git-core binutils ca-certificates initramfs-tools u-boot-tools
+apt-get -y install locales console-common less nano git
+echo "root:toor" | chpasswd
+sed -i -e 's/KERNEL\!=\"eth\*|/KERNEL\!=\"/' /lib/udev/rules.d/75-persistent-net-generator.rules
+rm -f /etc/udev/rules.d/70-persistent-net.rules
+export DEBIAN_FRONTEND=noninteractive
+apt-get --yes --force-yes install $packages
+apt-get --yes --force-yes dist-upgrade
+apt-get --yes --force-yes autoremove
+
+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+update-rc.d ssh enable
+
+rm -f /usr/sbin/policy-rc.d
+rm -f /usr/sbin/invoke-rc.d
+dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
+
+rm -f /third-stage
+EOF
+
+chmod +x kali-$architecture/third-stage
+LANG=C chroot kali-$architecture /third-stage
+
+cat << EOF > kali-$architecture/cleanup
+#!/bin/bash
+rm -rf /root/.bash_history
+apt-get update
+apt-get clean
+rm -f /0
+rm -f /hs_err*
+rm -f cleanup
+rm -f /usr/bin/qemu*
+EOF
+
+chmod +x kali-$architecture/cleanup
+LANG=C chroot kali-$architecture /cleanup
+
+umount kali-$architecture/proc/sys/fs/binfmt_misc
+umount kali-$architecture/dev/pts
+umount kali-$architecture/dev/
+umount kali-$architecture/proc
+
+# Create the disk and partition it
+dd if=/dev/zero of=${basedir}/kali-$1-bananapro.img bs=1M count=7000
+parted kali-$1-bananapro.img --script -- mklabel msdos
+parted kali-$1-bananapro.img --script -- mkpart primary fat32 2048s 264191s
+parted kali-$1-bananapro.img --script -- mkpart primary ext4 264192s 100%
+
+# Set the partition variables
+loopdevice=`losetup -f --show ${basedir}/kali-$1-bananapro.img`
+device=`kpartx -va $loopdevice| sed -E 's/.*(loop[0-9])p.*/\1/g' | head -1`
+sleep 5
+device="/dev/mapper/${device}"
+bootp=${device}p1
+rootp=${device}p2
+
+# Create file systems
+mkfs.vfat $bootp
+mkfs.ext4 $rootp
+
+# Create the dirs for the partitions and mount them
+mkdir -p ${basedir}/bootp ${basedir}/root
+mount $bootp ${basedir}/bootp
+mount $rootp ${basedir}/root
+
+echo "Rsyncing rootfs to image file"
+rsync -HPavz -q ${basedir}/kali-$architecture/ ${basedir}/root/
+
+
+# Enable the serial console
+echo "T1:12345:respawn:/sbin/agetty -L ttyS0 115200 vt100" >> ${basedir}/root/etc/inittab
+# Load the ethernet module since it doesn't load automatically at boot.
+echo "sunxi_emac" >> ${basedir}/root/etc/modules
+
+cat << EOF > ${basedir}/root/etc/apt/sources.list
+deb http://http.kali.org/kali kali-rolling main non-free contrib
+deb-src http://http.kali.org/kali kali-rolling main non-free contrib
+EOF
+
+# Uncomment this if you use apt-cacher-ng otherwise git clones will fail.
+#unset http_proxy
+
+# Kernel section.  If you want to us ea custom kernel, or configuration, replace
+# them in this section.
+# Get, compile and install kernel
+git clone --depth 1 https://github.com/LeMaker/u-boot-bananapi
+git clone --depth 1 https://github.com/LeMaker/linux-sunxi -b lemaker-3.4 ${basedir}/root/usr/src/kernel
+git clone --depth 1 https://github.com/linux-sunxi/sunxi-tools
+git clone --depth 1 https://github.com/LeMaker/sunxi-boards
+
+cd ${basedir}/sunxi-tools
+make fex2bin
+./fex2bin ${basedir}/sunxi-boards/sys_config/a20/BananaPro.fex ${basedir}/bootp/script.bin
+
+cd ${basedir}/root/usr/src/kernel
+git rev-parse HEAD > ../kernel-at-commit
+patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/mac80211.patch
+touch .scmversion
+export ARCH=arm
+export CROSS_COMPILE=arm-linux-gnueabihf-
+cp ${basedir}/../kernel-configs/lemaker.config .config
+cp ${basedir}/../kernel-configs/lemaker.config ../lemaker.config
+make -j $(grep -c processor /proc/cpuinfo) uImage modules
+make modules_install INSTALL_MOD_PATH=${basedir}/root
+rm -rf ${basedir}/root/lib/firmware
+cd ${basedir}/root/lib/
+git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
+rm -rf ${basedir}/root/lib/firmware/.git
+cd ${basedir}/root/usr/src/kernel/
+make INSTALL_MOD_PATH=${basedir}/root firmware_install
+cp arch/arm/boot/uImage ${basedir}/bootp
+make mrproper
+cp ../lemaker.config .config
+make modules_prepare
+cd ${basedir}
+
+# Create boot.txt file
+cat << EOF > ${basedir}/bootp/boot.cmd
+setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra} rw rootfstype=ext4 net.ifnames=0
+fatload mmc 0 0x43000000 script.bin
+fatload mmc 0 0x48000000 uImage
+bootm 0x48000000
+EOF
+
+# Create u-boot boot script image
+mkimage -A arm -T script -C none -d ${basedir}/bootp/boot.cmd ${basedir}/bootp/boot.scr
+
+cd ${basedir}/u-boot-bananapi/
+# Build u-boot
+make distclean
+make BananaPro_config
+make -j $(grep -c processor /proc/cpuinfo)
+
+dd if=u-boot-sunxi-with-spl.bin of=$loopdevice bs=1024 seek=8
+
+cd ${basedir}
+
+cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
+chmod +x ${basedir}/root/etc/init.d/zram
+
+# Unmount partitions
+umount $bootp
+umount $rootp
+kpartx -dv $loopdevice
+
+# Clean up all the temporary build stuff and remove the directories.
+# Comment this out to keep things around if you want to see what may have gone
+# wrong.
+echo "Cleaning up the temporary build files..."
+rm -rf ${basedir}/u-boot-bananapi ${basedir}/kernel ${basedir}/bootp ${basedir}/root ${basedir}/kali-$architecture ${basedir}/boot ${basedir}/patches ${basedir}/*sunxi*
+
+# If you're building an image for yourself, comment all of this out, as you
+# don't need the sha1sum or to compress the image, since you will be testing it
+# soon.
+echo "Generating sha1sum of kali-$1-bananapro.img"
+sha1sum kali-$1-bananapro.img > ${basedir}/kali-$1-bananapro.img.sha1sum
+# Don't pixz on 32bit, there isn't enough memory to compress the images.
+MACHINE_TYPE=`uname -m`
+if [ ${MACHINE_TYPE} == 'x86_64' ]; then
+echo "Compressing kali-$1-bananapro.img"
+pixz ${basedir}/kali-$1-bananapro.img ${basedir}/kali-$1-bananapro.img.xz
+rm ${basedir}/kali-$1-bananapro.img
+echo "Generating sha1sum of kali-$1-bananapro.img.xz"
+sha1sum kali-$1-bananapro.img.xz > ${basedir}/kali-$1-bananapro.img.xz.sha1sum
+fi
--- a/bbb.sh
+++ b/bbb.sh
@@ -63,6 +63,7 @@ iface lo inet loopback
 auto eth0
 iface eth0 inet dhcp

+auto usb0
 iface usb0 inet static
    address 192.168.7.2
    netmask 255.255.255.0
@@ -218,7 +219,7 @@ loadfdt=load mmc \${mmcdev}:\${mmcpart} \${fdtaddr} /dtbs/\${fdtfile}
 #
 
 console=ttyO0,115200n8
-mmcroot=/dev/mmcblk0p2 rw
+mmcroot=/dev/mmcblk0p2 rw net.ifnames=0
 mmcrootfstype=ext4 rootwait fixrtc
 
 ##To disable HDMI/eMMC...
--- a/chromebook-arm-exynos.sh
+++ b/chromebook-arm-exynos.sh
@@ -180,7 +180,7 @@ EOF

 # Kernel section.  If you want to use a custom kernel, or configuration, replace
 # them in this section.
-git clone --depth 2 https://chromium.googlesource.com/chromiumos/third_party/kernel -b chromeos-3.8 ${basedir}/root/usr/src/kernel
+git clone --depth 1 https://chromium.googlesource.com/chromiumos/third_party/kernel -b chromeos-3.8 ${basedir}/root/usr/src/kernel
 cd ${basedir}/root/usr/src/kernel
 cp ${basedir}/../kernel-configs/chromebook-3.8.config .config
 cp ${basedir}/../kernel-configs/chromebook-3.8.config ../exynos.config
--- a/chromebook-arm-veyron.sh
+++ b/chromebook-arm-veyron.sh
@@ -36,6 +36,7 @@ extras="florence iceweasel xfce4-goodies xfce4-terminal xinput wpasupplicant"

 packages="${arm} ${base} ${desktop} ${tools} ${services} ${extras}"
 architecture="armhf"
+kernel_commit="7247c395ff6b325d2dbffc5a9c9f1c30417ce133"
 # If you have your own preferred mirrors, set them here.
 # After generating the rootfs, we set the sources.list to the default settings.
 mirror=http.kali.org
@@ -182,9 +183,10 @@ EOF
 # them in this section.
 git clone --depth 1 https://chromium.googlesource.com/chromiumos/third_party/kernel -b chromeos-3.14 ${basedir}/root/usr/src/kernel
 cd ${basedir}/root/usr/src/kernel
+git checkout $kernel_commit
 cp ${basedir}/../kernel-configs/chromebook-rockchip-3.14_wireless-3.8.config .config
 cp ${basedir}/../kernel-configs/chromebook-rockchip-3.14_wireless-3.8.config ../veyron.config
-git rev-parse HEAD > ../kernel-at-commit
+echo $kernel_commit > ../kernel-at-commit
 export ARCH=arm
 # Edit the CROSS_COMPILE variable as needed.
 export CROSS_COMPILE=arm-linux-gnueabihf-
@@ -2309,6 +2311,8 @@ umount $rootp

 dd if=${basedir}/kernel.bin of=$bootp

+cgpt repair $loopdevice
+
 kpartx -dv $loopdevice
 losetup -d $loopdevice

--- a/cubieboard2.sh
+++ b/cubieboard2.sh
@@ -215,7 +215,7 @@ cd ${basedir}

 # Create boot.txt file
 cat << EOF > ${basedir}/bootp/boot.cmd
-setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra}
+setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra} rw rootfstype=ext4 net.ifnames=0
 fatload mmc 0 0x43000000 script.bin
 fatload mmc 0 0x48000000 uImage
 bootm 0x48000000
--- a/cubietruck.sh
+++ b/cubietruck.sh
@@ -216,7 +216,7 @@ cd ${basedir}
 # Create boot.txt file
 cat << EOF > ${basedir}/bootp/boot.cmd
 setenv bootm_boot_mode sec
-setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra}
+setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra} rw rootfstype=ext4 net.ifnames=0
 fatload mmc 0 0x43000000 script.bin
 fatload mmc 0 0x48000000 uImage
 bootm 0x48000000
--- a/cubox-i.sh
+++ b/cubox-i.sh
@@ -208,7 +208,7 @@ cd ${basedir}
 cat << EOF > ${basedir}/root/uEnv.txt
 bootfile=zImage
 mmcargs=setenv bootargs root=/dev/mmcblk0p1 rootwait video=mxcfb0:dev=hdmi \
-consoleblank=0 console=ttymxc0,115200
+consoleblank=0 console=ttymxc0,115200 net.ifnames=0 rw rootfstype=ext4
 EOF

 rm -rf ${basedir}/root/lib/firmware
--- a/cubox.sh
+++ b/cubox.sh
@@ -220,10 +220,10 @@ if itest.s \${device_name} -eq ide; then
 fi

 if itest.s \$root_device -ne ?; then
-  setenv bootargs "console=ttyS0,115200n8 vmalloc=448M video=dovefb:lcd0:1920x1080-32@60-edid clcd.lcd0_enable=1 clcd.lcd1_enable=0 root=\${root_device} rootfstype=ext4"
+  setenv bootargs "console=ttyS0,115200n8 vmalloc=448M video=dovefb:lcd0:1920x1080-32@60-edid clcd.lcd0_enable=1 clcd.lcd1_enable=0 root=\${root_device} rootfstype=ext4 rw net.ifnames=0"
  setenv loadimage "\${fstype}load \${device_name} \${unit_no}:\${partition} 0x00200000 \${directory}\${image_name}" 
  \$loadimage && bootm 0x00200000
-  
+
  echo "!! Unable to load \${directory}\${image_name} from \${device_name} \${unit_no}:\${partition} !!"
  exit
 fi
--- a/kernel-configs/chromebook-3.8.config
+++ b/kernel-configs/chromebook-3.8.config
@@ -458,19 +458,18 @@ CONFIG_HZ=200
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_HAVE_MEMBLOCK=y
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 # CONFIG_COMPACTION is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -985,7 +984,9 @@ CONFIG_BT_RFCOMM=m
 # CONFIG_BT_RFCOMM_TTY is not set
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
 CONFIG_BT_LE=y
+# CONFIG_BT_LEDS is not set
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BT_DEBUGFS=y

@@ -994,8 +995,10 @@ CONFIG_BT_DEBUGFS=y
 #
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
@@ -1005,6 +1008,7 @@ CONFIG_BT_HCIUART_LL=y
 # CONFIG_BT_HCIUART_3WIRE is not set
 # CONFIG_BT_HCIUART_INTEL is not set
 # CONFIG_BT_HCIUART_BCM is not set
+# CONFIG_BT_HCIUART_QCA is not set
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIBPA10X is not set
 CONFIG_BT_HCIBFUSB=m
@@ -2284,13 +2288,12 @@ CONFIG_MALI_TIMELINE_DISABLED=y
 # CONFIG_MALI_GATOR_SUPPORT is not set
 # CONFIG_MALI_MIPE_ENABLED is not set
 CONFIG_MALI_MIDGARD_DVFS=y
-# CONFIG_MALI_MIDGARD_RT_PM is not set
 # CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set
-CONFIG_MALI_MIDGARD_DEBUG_SYS=y
 # CONFIG_MALI_DEVFREQ is not set
 CONFIG_MALI_EXPERT=y
 # CONFIG_MALI_DEBUG_SHADER_SPLIT_FS is not set
 CONFIG_MALI_PLATFORM_FAKE=y
+# CONFIG_MALI_PLATFORM_DEVICETREE is not set
 CONFIG_MALI_PLATFORM_THIRDPARTY=y
 CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="chromebook"
 # CONFIG_MALI_DEBUG is not set
--- a/kernel-configs/chromebook-3.8_wireless-3.4.config
+++ b/kernel-configs/chromebook-3.8_wireless-3.4.config
@@ -457,19 +457,18 @@ CONFIG_HZ=200
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HIGHMEM=y
 # CONFIG_HIGHPTE is not set
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_FLATMEM_MANUAL=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_HAVE_MEMBLOCK=y
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 # CONFIG_COMPACTION is not set
 # CONFIG_PHYS_ADDR_T_64BIT is not set
@@ -984,7 +983,9 @@ CONFIG_BT_RFCOMM=m
 # CONFIG_BT_RFCOMM_TTY is not set
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
 CONFIG_BT_LE=y
+# CONFIG_BT_LEDS is not set
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BT_DEBUGFS=y

@@ -993,8 +994,10 @@ CONFIG_BT_DEBUGFS=y
 #
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
@@ -1004,6 +1007,7 @@ CONFIG_BT_HCIUART_LL=y
 # CONFIG_BT_HCIUART_3WIRE is not set
 # CONFIG_BT_HCIUART_INTEL is not set
 # CONFIG_BT_HCIUART_BCM is not set
+# CONFIG_BT_HCIUART_QCA is not set
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIBPA10X is not set
 CONFIG_BT_HCIBFUSB=m
@@ -2283,15 +2287,16 @@ CONFIG_DRM_ANX7808=y
 # ARM GPU Configuration
 #
 CONFIG_MALI_MIDGARD=y
+CONFIG_MALI_TIMELINE_DISABLED=y
 # CONFIG_MALI_GATOR_SUPPORT is not set
+# CONFIG_MALI_MIPE_ENABLED is not set
 CONFIG_MALI_MIDGARD_DVFS=y
-# CONFIG_MALI_MIDGARD_RT_PM is not set
 # CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set
-CONFIG_MALI_MIDGARD_DEBUG_SYS=y
-CONFIG_MALI_EXPERT=y
 # CONFIG_MALI_DEVFREQ is not set
+CONFIG_MALI_EXPERT=y
 # CONFIG_MALI_DEBUG_SHADER_SPLIT_FS is not set
 CONFIG_MALI_PLATFORM_FAKE=y
+# CONFIG_MALI_PLATFORM_DEVICETREE is not set
 CONFIG_MALI_PLATFORM_THIRDPARTY=y
 CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="chromebook"
 # CONFIG_MALI_DEBUG is not set
--- a/kernel-configs/lemaker.config
+++ b/kernel-configs/lemaker.config
--- a/kernel-configs/nanopi2-1080p.config
+++ b/kernel-configs/nanopi2-1080p.config
@@ -348,6 +348,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 #
 CONFIG_SUSPEND_POWEROFF=y
 # CONFIG_SUSPEND_IDLE is not set
+CONFIG_CPU_S5P4418_SMP_ISR=y
 CONFIG_CPU_S5P4418_EX_PERI_BUS=y
 CONFIG_PWM_SYSFS=y
 CONFIG_HAVE_PWM_CH0=y
@@ -366,11 +367,9 @@ CONFIG_NXP_DISPLAY_RESCONV=y
 # Board features
 #
 # CONFIG_PLAT_S5P4418_DRONE is not set
-# CONFIG_PLAT_S5P4418_DRONE2 is not set
 # CONFIG_PLAT_S5P4418_SVT is not set
 # CONFIG_PLAT_S5P4418_ASB is not set
 # CONFIG_PLAT_S5P4418_LEPUS is not set
-# CONFIG_PLAT_S5P4418_DRONEL is not set
 CONFIG_PLAT_S5P4418_NANOPI2=y

 #
@@ -516,7 +515,7 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
 # CONFIG_USE_OF is not set
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
+CONFIG_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait g_ether.host_addr=82:cf:ce:fa:44:18 rootdelay=10 net.ifnames=0"
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FORCE=y
@@ -1243,8 +1242,51 @@ CONFIG_VETH=m
 #
 # CAIF transport drivers
 #
-# CONFIG_ETHERNET is not set
-# CONFIG_PHYLIB is not set
+CONFIG_ETHERNET=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_NXP=y
+CONFIG_NXPMAC_ETH=y
+CONFIG_NXPMAC_PLATFORM=y
+CONFIG_NXPMAC_DEBUG_FS=y
+CONFIG_NXPMAC_DA=y
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AMD_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+CONFIG_REALTEK_PHY=y
+# CONFIG_REALTEK_PHY_RTL8201 is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -1478,6 +1520,11 @@ CONFIG_TOUCHSCREEN_FT5X0X_SINGLE=y
 # CONFIG_TOUCHSCREEN_HC8600 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT640T is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
+CONFIG_TOUCHSCREEN_1WIRE=m
+CONFIG_AUTO_REPORT_1WIRE_INPUT=m
+CONFIG_TOUCHSCREEN_IF=y
+CONFIG_TOUCHSCREEN_IT7260=m
+# CONFIG_TOUCHSCREEN_IT7260_SINGLE is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -1570,6 +1617,12 @@ CONFIG_HW_RANDOM=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_DCC_TTY is not set
 # CONFIG_RAMOOPS is not set
+CONFIG_MATRIX_GPIO_INT=m
+CONFIG_MATRIX_PWM=m
+CONFIG_MATRIX_ROTARY_ENCODER=m
+CONFIG_MATRIX_HCSR04=m
+CONFIG_MATRIX_ADS7846=m
+CONFIG_MATRIX_IR_RECV=m
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -1649,7 +1702,15 @@ CONFIG_SPI_SPIDEV=y
 #
 # PPS support
 #
-# CONFIG_PPS is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set

 #
 # PPS generators support
@@ -1658,9 +1719,10 @@ CONFIG_SPI_SPIDEV=y
 #
 # PTP clock support
 #
+CONFIG_PTP_1588_CLOCK=y

 #
-# Enable Device Drivers -> PPS to see the PTP clock options.
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
@@ -1974,6 +2036,7 @@ CONFIG_VIDEO_NXP_CAPTURE=y
 CONFIG_NXP_CAPTURE_DECIMATOR=y
 # CONFIG_NXP_CAPTURE_MIPI_CSI is not set
 CONFIG_TURNAROUND_VIP_RESET=y
+# CONFIG_LOOPBACK_SENSOR_DRIVER is not set
 CONFIG_VIDEO_NXP_M2M=y
 CONFIG_NXP_M2M_SCALER=y
 CONFIG_ENABLE_SCALER_MISC_DEVICE=y
@@ -2017,6 +2080,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # Video decoders
 #
 # CONFIG_VIDEO_TW9992 is not set
+# CONFIG_VIDEO_TW9900 is not set
 # CONFIG_VIDEO_ADV7180 is not set
 # CONFIG_VIDEO_ADV7183 is not set
 # CONFIG_VIDEO_BT819 is not set
@@ -2077,6 +2141,7 @@ CONFIG_VIDEO_SP2518_FIXED_FRAMERATE=y
 # CONFIG_VIDEO_SP0A19 is not set
 CONFIG_VIDEO_SP0838=y
 CONFIG_VIDEO_SP0838_FIXED_FRAMERATE=y
+# CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_S5K6AA is not set

@@ -2185,15 +2250,16 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=y
 # CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set

@@ -2287,6 +2353,7 @@ CONFIG_SND_USB=y
 # CONFIG_SND_USB_6FIRE is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_NXP_SOC=y
+# CONFIG_SND_NXP_DFS is not set
 CONFIG_SND_NXP_I2S=y
 CONFIG_SND_NXP_I2S_CH0=y
 # CONFIG_SND_NXP_I2S_CH1 is not set
@@ -2294,6 +2361,7 @@ CONFIG_SND_NXP_I2S_CH0=y
 CONFIG_SND_NXP_SPDIF_TX=y
 CONFIG_SND_SPDIF_TRANSCIEVER=y
 # CONFIG_SND_SPDIF_RECEIVER is not set
+# CONFIG_SND_PDM_REC is not set
 # CONFIG_SND_CODEC_NULL is not set
 # CONFIG_SND_CODEC_RT5631 is not set
 # CONFIG_SND_CODEC_ES8316 is not set
@@ -2823,6 +2891,11 @@ CONFIG_NXP_ADC=y
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set

+#
+# Humidity sensors
+#
+CONFIG_DHT11=m
+
 #
 # Network Analyzer, Impedance Converters
 #
@@ -2895,6 +2968,37 @@ CONFIG_NXP_ADC=y
 # CONFIG_ANDROID is not set
 # CONFIG_PHONE is not set
 # CONFIG_USB_WPAN_HCD is not set
+CONFIG_FB_TFT=y
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ST7789S=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7735S=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_FLEX=m
+CONFIG_FB_TFT_FBTFT_DEVICE=m
 CONFIG_HAVE_MACH_CLKDEV=y

 #
--- a/kernel-configs/nanopi2-720p.config
+++ b/kernel-configs/nanopi2-720p.config
@@ -348,6 +348,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 #
 CONFIG_SUSPEND_POWEROFF=y
 # CONFIG_SUSPEND_IDLE is not set
+CONFIG_CPU_S5P4418_SMP_ISR=y
 CONFIG_CPU_S5P4418_EX_PERI_BUS=y
 CONFIG_PWM_SYSFS=y
 CONFIG_HAVE_PWM_CH0=y
@@ -366,11 +367,9 @@ CONFIG_NXP_DISPLAY_RESCONV=y
 # Board features
 #
 # CONFIG_PLAT_S5P4418_DRONE is not set
-# CONFIG_PLAT_S5P4418_DRONE2 is not set
 # CONFIG_PLAT_S5P4418_SVT is not set
 # CONFIG_PLAT_S5P4418_ASB is not set
 # CONFIG_PLAT_S5P4418_LEPUS is not set
-# CONFIG_PLAT_S5P4418_DRONEL is not set
 CONFIG_PLAT_S5P4418_NANOPI2=y

 #
@@ -516,7 +515,7 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
 # CONFIG_USE_OF is not set
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait"
+CONFIG_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait g_ether.host_addr=82:cf:ce:fa:44:18 rootdelay=10 net.ifnames=0"
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FORCE=y
@@ -1243,8 +1242,51 @@ CONFIG_VETH=m
 #
 # CAIF transport drivers
 #
-# CONFIG_ETHERNET is not set
-# CONFIG_PHYLIB is not set
+CONFIG_ETHERNET=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_NXP=y
+CONFIG_NXPMAC_ETH=y
+CONFIG_NXPMAC_PLATFORM=y
+CONFIG_NXPMAC_DEBUG_FS=y
+CONFIG_NXPMAC_DA=y
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AMD_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+CONFIG_REALTEK_PHY=y
+# CONFIG_REALTEK_PHY_RTL8201 is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -1478,6 +1520,11 @@ CONFIG_TOUCHSCREEN_FT5X0X_SINGLE=y
 # CONFIG_TOUCHSCREEN_HC8600 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT640T is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
+CONFIG_TOUCHSCREEN_1WIRE=m
+CONFIG_AUTO_REPORT_1WIRE_INPUT=m
+CONFIG_TOUCHSCREEN_IF=y
+CONFIG_TOUCHSCREEN_IT7260=m
+# CONFIG_TOUCHSCREEN_IT7260_SINGLE is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -1570,6 +1617,12 @@ CONFIG_HW_RANDOM=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_DCC_TTY is not set
 # CONFIG_RAMOOPS is not set
+CONFIG_MATRIX_GPIO_INT=m
+CONFIG_MATRIX_PWM=m
+CONFIG_MATRIX_ROTARY_ENCODER=m
+CONFIG_MATRIX_HCSR04=m
+CONFIG_MATRIX_ADS7846=m
+CONFIG_MATRIX_IR_RECV=m
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -1649,7 +1702,15 @@ CONFIG_SPI_SPIDEV=y
 #
 # PPS support
 #
-# CONFIG_PPS is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set

 #
 # PPS generators support
@@ -1658,9 +1719,10 @@ CONFIG_SPI_SPIDEV=y
 #
 # PTP clock support
 #
+CONFIG_PTP_1588_CLOCK=y

 #
-# Enable Device Drivers -> PPS to see the PTP clock options.
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
@@ -1974,6 +2036,7 @@ CONFIG_VIDEO_NXP_CAPTURE=y
 CONFIG_NXP_CAPTURE_DECIMATOR=y
 # CONFIG_NXP_CAPTURE_MIPI_CSI is not set
 CONFIG_TURNAROUND_VIP_RESET=y
+# CONFIG_LOOPBACK_SENSOR_DRIVER is not set
 CONFIG_VIDEO_NXP_M2M=y
 CONFIG_NXP_M2M_SCALER=y
 CONFIG_ENABLE_SCALER_MISC_DEVICE=y
@@ -2017,6 +2080,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # Video decoders
 #
 # CONFIG_VIDEO_TW9992 is not set
+# CONFIG_VIDEO_TW9900 is not set
 # CONFIG_VIDEO_ADV7180 is not set
 # CONFIG_VIDEO_ADV7183 is not set
 # CONFIG_VIDEO_BT819 is not set
@@ -2077,6 +2141,7 @@ CONFIG_VIDEO_SP2518_FIXED_FRAMERATE=y
 # CONFIG_VIDEO_SP0A19 is not set
 CONFIG_VIDEO_SP0838=y
 CONFIG_VIDEO_SP0838_FIXED_FRAMERATE=y
+# CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_S5K6AA is not set

@@ -2185,15 +2250,16 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=y
 # CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set

@@ -2287,6 +2353,7 @@ CONFIG_SND_USB=y
 # CONFIG_SND_USB_6FIRE is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_NXP_SOC=y
+# CONFIG_SND_NXP_DFS is not set
 CONFIG_SND_NXP_I2S=y
 CONFIG_SND_NXP_I2S_CH0=y
 # CONFIG_SND_NXP_I2S_CH1 is not set
@@ -2294,6 +2361,7 @@ CONFIG_SND_NXP_I2S_CH0=y
 CONFIG_SND_NXP_SPDIF_TX=y
 CONFIG_SND_SPDIF_TRANSCIEVER=y
 # CONFIG_SND_SPDIF_RECEIVER is not set
+# CONFIG_SND_PDM_REC is not set
 # CONFIG_SND_CODEC_NULL is not set
 # CONFIG_SND_CODEC_RT5631 is not set
 # CONFIG_SND_CODEC_ES8316 is not set
@@ -2823,6 +2891,11 @@ CONFIG_NXP_ADC=y
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set

+#
+# Humidity sensors
+#
+CONFIG_DHT11=m
+
 #
 # Network Analyzer, Impedance Converters
 #
@@ -2895,6 +2968,37 @@ CONFIG_NXP_ADC=y
 # CONFIG_ANDROID is not set
 # CONFIG_PHONE is not set
 # CONFIG_USB_WPAN_HCD is not set
+CONFIG_FB_TFT=y
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ST7789S=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7735S=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_FLEX=m
+CONFIG_FB_TFT_FBTFT_DEVICE=m
 CONFIG_HAVE_MACH_CLKDEV=y

 #
--- a/kernel-configs/nanopi2-lcd-hd101.config
+++ b/kernel-configs/nanopi2-lcd-hd101.config
@@ -348,6 +348,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 #
 CONFIG_SUSPEND_POWEROFF=y
 # CONFIG_SUSPEND_IDLE is not set
+CONFIG_CPU_S5P4418_SMP_ISR=y
 CONFIG_CPU_S5P4418_EX_PERI_BUS=y
 CONFIG_PWM_SYSFS=y
 CONFIG_HAVE_PWM_CH0=y
@@ -366,11 +367,9 @@ CONFIG_NXP_DISPLAY_RESCONV=y
 # Board features
 #
 # CONFIG_PLAT_S5P4418_DRONE is not set
-# CONFIG_PLAT_S5P4418_DRONE2 is not set
 # CONFIG_PLAT_S5P4418_SVT is not set
 # CONFIG_PLAT_S5P4418_ASB is not set
 # CONFIG_PLAT_S5P4418_LEPUS is not set
-# CONFIG_PLAT_S5P4418_DRONEL is not set
 CONFIG_PLAT_S5P4418_NANOPI2=y

 #
@@ -516,7 +515,7 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
 # CONFIG_USE_OF is not set
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait lcd=HD101"
+CONFIG_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait lcd=HD101 g_ether.host_addr=82:cf:ce:fa:44:18 rootdelay=10 net.ifnames=0"
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FORCE=y
@@ -1243,8 +1242,51 @@ CONFIG_VETH=m
 #
 # CAIF transport drivers
 #
-# CONFIG_ETHERNET is not set
-# CONFIG_PHYLIB is not set
+CONFIG_ETHERNET=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_NXP=y
+CONFIG_NXPMAC_ETH=y
+CONFIG_NXPMAC_PLATFORM=y
+CONFIG_NXPMAC_DEBUG_FS=y
+CONFIG_NXPMAC_DA=y
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AMD_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+CONFIG_REALTEK_PHY=y
+# CONFIG_REALTEK_PHY_RTL8201 is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -1478,6 +1520,11 @@ CONFIG_TOUCHSCREEN_FT5X0X_SINGLE=y
 # CONFIG_TOUCHSCREEN_HC8600 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT640T is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
+CONFIG_TOUCHSCREEN_1WIRE=m
+CONFIG_AUTO_REPORT_1WIRE_INPUT=m
+CONFIG_TOUCHSCREEN_IF=y
+CONFIG_TOUCHSCREEN_IT7260=m
+# CONFIG_TOUCHSCREEN_IT7260_SINGLE is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -1570,6 +1617,12 @@ CONFIG_HW_RANDOM=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_DCC_TTY is not set
 # CONFIG_RAMOOPS is not set
+CONFIG_MATRIX_GPIO_INT=m
+CONFIG_MATRIX_PWM=m
+CONFIG_MATRIX_ROTARY_ENCODER=m
+CONFIG_MATRIX_HCSR04=m
+CONFIG_MATRIX_ADS7846=m
+CONFIG_MATRIX_IR_RECV=m
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -1649,7 +1702,15 @@ CONFIG_SPI_SPIDEV=y
 #
 # PPS support
 #
-# CONFIG_PPS is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set

 #
 # PPS generators support
@@ -1658,9 +1719,10 @@ CONFIG_SPI_SPIDEV=y
 #
 # PTP clock support
 #
+CONFIG_PTP_1588_CLOCK=y

 #
-# Enable Device Drivers -> PPS to see the PTP clock options.
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
@@ -1974,6 +2036,7 @@ CONFIG_VIDEO_NXP_CAPTURE=y
 CONFIG_NXP_CAPTURE_DECIMATOR=y
 # CONFIG_NXP_CAPTURE_MIPI_CSI is not set
 CONFIG_TURNAROUND_VIP_RESET=y
+# CONFIG_LOOPBACK_SENSOR_DRIVER is not set
 CONFIG_VIDEO_NXP_M2M=y
 CONFIG_NXP_M2M_SCALER=y
 CONFIG_ENABLE_SCALER_MISC_DEVICE=y
@@ -2016,6 +2079,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # Video decoders
 #
 # CONFIG_VIDEO_TW9992 is not set
+# CONFIG_VIDEO_TW9900 is not set
 # CONFIG_VIDEO_ADV7180 is not set
 # CONFIG_VIDEO_ADV7183 is not set
 # CONFIG_VIDEO_BT819 is not set
@@ -2076,6 +2140,7 @@ CONFIG_VIDEO_SP2518_FIXED_FRAMERATE=y
 # CONFIG_VIDEO_SP0A19 is not set
 CONFIG_VIDEO_SP0838=y
 CONFIG_VIDEO_SP0838_FIXED_FRAMERATE=y
+# CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_S5K6AA is not set

@@ -2184,15 +2249,16 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=y
 # CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set

@@ -2243,10 +2309,6 @@ CONFIG_NXP_DISPLAY_LCD_IN=0
 # CONFIG_NXP_DISPLAY_MIPI is not set
 # CONFIG_NXP_DISPLAY_TVOUT is not set
 # CONFIG_NXP_DISPLAY_HDMI is not set
-# CONFIG_NXP_DISPLAY_HDMI_1280_720P is not set
-# CONFIG_NXP_DISPLAY_HDMI_1920_1080P is not set
-# CONFIG_NXP_DISPLAY_HDMI_AUDIO_SPDIF is not set
-# CONFIG_NXP_DISPLAY_HDMI_AUDIO_I2S is not set

 #
 # Console display driver support
@@ -2285,6 +2347,7 @@ CONFIG_SND_USB=y
 # CONFIG_SND_USB_6FIRE is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_NXP_SOC=y
+# CONFIG_SND_NXP_DFS is not set
 CONFIG_SND_NXP_I2S=y
 CONFIG_SND_NXP_I2S_CH0=y
 # CONFIG_SND_NXP_I2S_CH1 is not set
@@ -2292,6 +2355,7 @@ CONFIG_SND_NXP_I2S_CH0=y
 CONFIG_SND_NXP_SPDIF_TX=y
 CONFIG_SND_SPDIF_TRANSCIEVER=y
 # CONFIG_SND_SPDIF_RECEIVER is not set
+# CONFIG_SND_PDM_REC is not set
 # CONFIG_SND_CODEC_NULL is not set
 # CONFIG_SND_CODEC_RT5631 is not set
 # CONFIG_SND_CODEC_ES8316 is not set
@@ -2821,6 +2885,11 @@ CONFIG_NXP_ADC=y
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set

+#
+# Humidity sensors
+#
+CONFIG_DHT11=m
+
 #
 # Network Analyzer, Impedance Converters
 #
@@ -2893,6 +2962,37 @@ CONFIG_NXP_ADC=y
 # CONFIG_ANDROID is not set
 # CONFIG_PHONE is not set
 # CONFIG_USB_WPAN_HCD is not set
+CONFIG_FB_TFT=y
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ST7789S=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7735S=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_FLEX=m
+CONFIG_FB_TFT_FBTFT_DEVICE=m
 CONFIG_HAVE_MACH_CLKDEV=y

 #
--- a/kernel-configs/nanopi2-lcd-hd700.config
+++ b/kernel-configs/nanopi2-lcd-hd700.config
@@ -348,6 +348,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 #
 CONFIG_SUSPEND_POWEROFF=y
 # CONFIG_SUSPEND_IDLE is not set
+CONFIG_CPU_S5P4418_SMP_ISR=y
 CONFIG_CPU_S5P4418_EX_PERI_BUS=y
 CONFIG_PWM_SYSFS=y
 CONFIG_HAVE_PWM_CH0=y
@@ -366,11 +367,9 @@ CONFIG_NXP_DISPLAY_RESCONV=y
 # Board features
 #
 # CONFIG_PLAT_S5P4418_DRONE is not set
-# CONFIG_PLAT_S5P4418_DRONE2 is not set
 # CONFIG_PLAT_S5P4418_SVT is not set
 # CONFIG_PLAT_S5P4418_ASB is not set
 # CONFIG_PLAT_S5P4418_LEPUS is not set
-# CONFIG_PLAT_S5P4418_DRONEL is not set
 CONFIG_PLAT_S5P4418_NANOPI2=y

 #
@@ -516,7 +515,7 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
 # CONFIG_USE_OF is not set
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait lcd=HD700,213dpi"
+CONFIG_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait lcd=HD700,213dpi g_ether.host_addr=82:cf:ce:fa:44:18 rootdelay=10 net.ifnames=0"
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FORCE=y
@@ -1243,8 +1242,51 @@ CONFIG_VETH=m
 #
 # CAIF transport drivers
 #
-# CONFIG_ETHERNET is not set
-# CONFIG_PHYLIB is not set
+CONFIG_ETHERNET=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_NXP=y
+CONFIG_NXPMAC_ETH=y
+CONFIG_NXPMAC_PLATFORM=y
+CONFIG_NXPMAC_DEBUG_FS=y
+CONFIG_NXPMAC_DA=y
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AMD_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+CONFIG_REALTEK_PHY=y
+# CONFIG_REALTEK_PHY_RTL8201 is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -1478,6 +1520,11 @@ CONFIG_TOUCHSCREEN_FT5X0X_SINGLE=y
 # CONFIG_TOUCHSCREEN_HC8600 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT640T is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
+CONFIG_TOUCHSCREEN_1WIRE=m
+CONFIG_AUTO_REPORT_1WIRE_INPUT=m
+CONFIG_TOUCHSCREEN_IF=y
+CONFIG_TOUCHSCREEN_IT7260=m
+# CONFIG_TOUCHSCREEN_IT7260_SINGLE is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -1570,6 +1617,12 @@ CONFIG_HW_RANDOM=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_DCC_TTY is not set
 # CONFIG_RAMOOPS is not set
+CONFIG_MATRIX_GPIO_INT=m
+CONFIG_MATRIX_PWM=m
+CONFIG_MATRIX_ROTARY_ENCODER=m
+CONFIG_MATRIX_HCSR04=m
+CONFIG_MATRIX_ADS7846=m
+CONFIG_MATRIX_IR_RECV=m
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -1649,7 +1702,15 @@ CONFIG_SPI_SPIDEV=y
 #
 # PPS support
 #
-# CONFIG_PPS is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set

 #
 # PPS generators support
@@ -1658,9 +1719,10 @@ CONFIG_SPI_SPIDEV=y
 #
 # PTP clock support
 #
+CONFIG_PTP_1588_CLOCK=y

 #
-# Enable Device Drivers -> PPS to see the PTP clock options.
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
@@ -1974,6 +2036,7 @@ CONFIG_VIDEO_NXP_CAPTURE=y
 CONFIG_NXP_CAPTURE_DECIMATOR=y
 # CONFIG_NXP_CAPTURE_MIPI_CSI is not set
 CONFIG_TURNAROUND_VIP_RESET=y
+# CONFIG_LOOPBACK_SENSOR_DRIVER is not set
 CONFIG_VIDEO_NXP_M2M=y
 CONFIG_NXP_M2M_SCALER=y
 CONFIG_ENABLE_SCALER_MISC_DEVICE=y
@@ -2016,6 +2079,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # Video decoders
 #
 # CONFIG_VIDEO_TW9992 is not set
+# CONFIG_VIDEO_TW9900 is not set
 # CONFIG_VIDEO_ADV7180 is not set
 # CONFIG_VIDEO_ADV7183 is not set
 # CONFIG_VIDEO_BT819 is not set
@@ -2076,6 +2140,7 @@ CONFIG_VIDEO_SP2518_FIXED_FRAMERATE=y
 # CONFIG_VIDEO_SP0A19 is not set
 CONFIG_VIDEO_SP0838=y
 CONFIG_VIDEO_SP0838_FIXED_FRAMERATE=y
+# CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_S5K6AA is not set

@@ -2184,15 +2249,16 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=y
 # CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set

@@ -2243,10 +2309,6 @@ CONFIG_NXP_DISPLAY_LCD_IN=0
 # CONFIG_NXP_DISPLAY_MIPI is not set
 # CONFIG_NXP_DISPLAY_TVOUT is not set
 # CONFIG_NXP_DISPLAY_HDMI is not set
-# CONFIG_NXP_DISPLAY_HDMI_1280_720P is not set
-# CONFIG_NXP_DISPLAY_HDMI_1920_1080P is not set
-# CONFIG_NXP_DISPLAY_HDMI_AUDIO_SPDIF is not set
-# CONFIG_NXP_DISPLAY_HDMI_AUDIO_I2S is not set

 #
 # Console display driver support
@@ -2285,6 +2347,7 @@ CONFIG_SND_USB=y
 # CONFIG_SND_USB_6FIRE is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_NXP_SOC=y
+# CONFIG_SND_NXP_DFS is not set
 CONFIG_SND_NXP_I2S=y
 CONFIG_SND_NXP_I2S_CH0=y
 # CONFIG_SND_NXP_I2S_CH1 is not set
@@ -2292,6 +2355,7 @@ CONFIG_SND_NXP_I2S_CH0=y
 CONFIG_SND_NXP_SPDIF_TX=y
 CONFIG_SND_SPDIF_TRANSCIEVER=y
 # CONFIG_SND_SPDIF_RECEIVER is not set
+# CONFIG_SND_PDM_REC is not set
 # CONFIG_SND_CODEC_NULL is not set
 # CONFIG_SND_CODEC_RT5631 is not set
 # CONFIG_SND_CODEC_ES8316 is not set
@@ -2821,6 +2885,11 @@ CONFIG_NXP_ADC=y
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set

+#
+# Humidity sensors
+#
+CONFIG_DHT11=m
+
 #
 # Network Analyzer, Impedance Converters
 #
@@ -2893,6 +2962,37 @@ CONFIG_NXP_ADC=y
 # CONFIG_ANDROID is not set
 # CONFIG_PHONE is not set
 # CONFIG_USB_WPAN_HCD is not set
+CONFIG_FB_TFT=y
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ST7789S=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7735S=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_FLEX=m
+CONFIG_FB_TFT_FBTFT_DEVICE=m
 CONFIG_HAVE_MACH_CLKDEV=y

 #
--- a/kernel-configs/nanopi2-lcd.config
+++ b/kernel-configs/nanopi2-lcd.config
@@ -348,6 +348,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
 #
 CONFIG_SUSPEND_POWEROFF=y
 # CONFIG_SUSPEND_IDLE is not set
+CONFIG_CPU_S5P4418_SMP_ISR=y
 CONFIG_CPU_S5P4418_EX_PERI_BUS=y
 CONFIG_PWM_SYSFS=y
 CONFIG_HAVE_PWM_CH0=y
@@ -366,11 +367,9 @@ CONFIG_NXP_DISPLAY_RESCONV=y
 # Board features
 #
 # CONFIG_PLAT_S5P4418_DRONE is not set
-# CONFIG_PLAT_S5P4418_DRONE2 is not set
 # CONFIG_PLAT_S5P4418_SVT is not set
 # CONFIG_PLAT_S5P4418_ASB is not set
 # CONFIG_PLAT_S5P4418_LEPUS is not set
-# CONFIG_PLAT_S5P4418_DRONEL is not set
 CONFIG_PLAT_S5P4418_NANOPI2=y

 #
@@ -516,7 +515,7 @@ CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
 # CONFIG_USE_OF is not set
 CONFIG_ZBOOT_ROM_TEXT=0
 CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait lcd=S70,128dpi"
+CONFIG_CMDLINE="console=ttyAMA0,115200n8 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait lcd=S70,128dpi g_ether.host_addr=82:cf:ce:fa:44:18 rootdelay=10 net.ifnames=0"
 # CONFIG_CMDLINE_FROM_BOOTLOADER is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FORCE=y
@@ -1243,8 +1242,51 @@ CONFIG_VETH=m
 #
 # CAIF transport drivers
 #
-# CONFIG_ETHERNET is not set
-# CONFIG_PHYLIB is not set
+CONFIG_ETHERNET=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_CALXEDA_XGMAC is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_DM9000 is not set
+# CONFIG_DNET is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_NXP=y
+CONFIG_NXPMAC_ETH=y
+CONFIG_NXPMAC_PLATFORM=y
+CONFIG_NXPMAC_DEBUG_FS=y
+CONFIG_NXPMAC_DA=y
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_AMD_PHY is not set
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+CONFIG_REALTEK_PHY=y
+# CONFIG_REALTEK_PHY_RTL8201 is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_PPP=m
 CONFIG_PPP_BSDCOMP=m
@@ -1478,6 +1520,11 @@ CONFIG_TOUCHSCREEN_FT5X0X_SINGLE=y
 # CONFIG_TOUCHSCREEN_HC8600 is not set
 # CONFIG_TOUCHSCREEN_ATMEL_MXT640T is not set
 # CONFIG_TOUCHSCREEN_GOODIX is not set
+CONFIG_TOUCHSCREEN_1WIRE=m
+CONFIG_AUTO_REPORT_1WIRE_INPUT=m
+CONFIG_TOUCHSCREEN_IF=y
+CONFIG_TOUCHSCREEN_IT7260=m
+# CONFIG_TOUCHSCREEN_IT7260_SINGLE is not set
 CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
@@ -1570,6 +1617,12 @@ CONFIG_HW_RANDOM=y
 # CONFIG_TCG_TPM is not set
 # CONFIG_DCC_TTY is not set
 # CONFIG_RAMOOPS is not set
+CONFIG_MATRIX_GPIO_INT=m
+CONFIG_MATRIX_PWM=m
+CONFIG_MATRIX_ROTARY_ENCODER=m
+CONFIG_MATRIX_HCSR04=m
+CONFIG_MATRIX_ADS7846=m
+CONFIG_MATRIX_IR_RECV=m
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -1649,7 +1702,15 @@ CONFIG_SPI_SPIDEV=y
 #
 # PPS support
 #
-# CONFIG_PPS is not set
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+# CONFIG_PPS_CLIENT_LDISC is not set
+# CONFIG_PPS_CLIENT_GPIO is not set

 #
 # PPS generators support
@@ -1658,9 +1719,10 @@ CONFIG_SPI_SPIDEV=y
 #
 # PTP clock support
 #
+CONFIG_PTP_1588_CLOCK=y

 #
-# Enable Device Drivers -> PPS to see the PTP clock options.
+# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks.
 #
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 CONFIG_GPIOLIB=y
@@ -1974,6 +2036,7 @@ CONFIG_VIDEO_NXP_CAPTURE=y
 CONFIG_NXP_CAPTURE_DECIMATOR=y
 # CONFIG_NXP_CAPTURE_MIPI_CSI is not set
 CONFIG_TURNAROUND_VIP_RESET=y
+# CONFIG_LOOPBACK_SENSOR_DRIVER is not set
 CONFIG_VIDEO_NXP_M2M=y
 CONFIG_NXP_M2M_SCALER=y
 CONFIG_ENABLE_SCALER_MISC_DEVICE=y
@@ -2016,6 +2079,7 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # Video decoders
 #
 # CONFIG_VIDEO_TW9992 is not set
+# CONFIG_VIDEO_TW9900 is not set
 # CONFIG_VIDEO_ADV7180 is not set
 # CONFIG_VIDEO_ADV7183 is not set
 # CONFIG_VIDEO_BT819 is not set
@@ -2076,6 +2140,7 @@ CONFIG_VIDEO_SP2518_FIXED_FRAMERATE=y
 # CONFIG_VIDEO_SP0A19 is not set
 CONFIG_VIDEO_SP0838=y
 CONFIG_VIDEO_SP0838_FIXED_FRAMERATE=y
+# CONFIG_VIDEO_OV5640 is not set
 # CONFIG_VIDEO_OV5645 is not set
 # CONFIG_VIDEO_S5K6AA is not set

@@ -2184,15 +2249,16 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_SYS_FOPS=y
 # CONFIG_FB_WMT_GE_ROPS is not set
+CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_SVGALIB is not set
 # CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
+CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_TILEBLITTING is not set

@@ -2243,10 +2309,6 @@ CONFIG_NXP_DISPLAY_LCD_IN=0
 # CONFIG_NXP_DISPLAY_MIPI is not set
 # CONFIG_NXP_DISPLAY_TVOUT is not set
 # CONFIG_NXP_DISPLAY_HDMI is not set
-# CONFIG_NXP_DISPLAY_HDMI_1280_720P is not set
-# CONFIG_NXP_DISPLAY_HDMI_1920_1080P is not set
-# CONFIG_NXP_DISPLAY_HDMI_AUDIO_SPDIF is not set
-# CONFIG_NXP_DISPLAY_HDMI_AUDIO_I2S is not set

 #
 # Console display driver support
@@ -2285,6 +2347,7 @@ CONFIG_SND_USB=y
 # CONFIG_SND_USB_6FIRE is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_NXP_SOC=y
+# CONFIG_SND_NXP_DFS is not set
 CONFIG_SND_NXP_I2S=y
 CONFIG_SND_NXP_I2S_CH0=y
 # CONFIG_SND_NXP_I2S_CH1 is not set
@@ -2292,6 +2355,7 @@ CONFIG_SND_NXP_I2S_CH0=y
 CONFIG_SND_NXP_SPDIF_TX=y
 CONFIG_SND_SPDIF_TRANSCIEVER=y
 # CONFIG_SND_SPDIF_RECEIVER is not set
+# CONFIG_SND_PDM_REC is not set
 # CONFIG_SND_CODEC_NULL is not set
 # CONFIG_SND_CODEC_RT5631 is not set
 # CONFIG_SND_CODEC_ES8316 is not set
@@ -2821,6 +2885,11 @@ CONFIG_NXP_ADC=y
 # CONFIG_ADIS16260 is not set
 # CONFIG_ADXRS450 is not set

+#
+# Humidity sensors
+#
+CONFIG_DHT11=m
+
 #
 # Network Analyzer, Impedance Converters
 #
@@ -2893,6 +2962,37 @@ CONFIG_NXP_ADC=y
 # CONFIG_ANDROID is not set
 # CONFIG_PHONE is not set
 # CONFIG_USB_WPAN_HCD is not set
+CONFIG_FB_TFT=y
+CONFIG_FB_TFT_AGM1264K_FL=m
+CONFIG_FB_TFT_BD663474=m
+CONFIG_FB_TFT_HX8340BN=m
+CONFIG_FB_TFT_HX8347D=m
+CONFIG_FB_TFT_HX8353D=m
+CONFIG_FB_TFT_ILI9163=m
+CONFIG_FB_TFT_ILI9320=m
+CONFIG_FB_TFT_ILI9325=m
+CONFIG_FB_TFT_ILI9340=m
+CONFIG_FB_TFT_ILI9341=m
+CONFIG_FB_TFT_ST7789S=m
+CONFIG_FB_TFT_ILI9481=m
+CONFIG_FB_TFT_ILI9486=m
+CONFIG_FB_TFT_PCD8544=m
+CONFIG_FB_TFT_RA8875=m
+CONFIG_FB_TFT_S6D02A1=m
+CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SSD1289=m
+CONFIG_FB_TFT_SSD1306=m
+CONFIG_FB_TFT_SSD1331=m
+CONFIG_FB_TFT_SSD1351=m
+CONFIG_FB_TFT_ST7735R=m
+CONFIG_FB_TFT_ST7735S=m
+CONFIG_FB_TFT_TINYLCD=m
+CONFIG_FB_TFT_TLS8204=m
+CONFIG_FB_TFT_UC1701=m
+CONFIG_FB_TFT_UPD161704=m
+CONFIG_FB_TFT_WATTEROTT=m
+CONFIG_FB_FLEX=m
+CONFIG_FB_TFT_FBTFT_DEVICE=m
 CONFIG_HAVE_MACH_CLKDEV=y

 #
--- a/kernel-configs/odroid-c2.config
+++ b/kernel-configs/odroid-c2.config
--- a/kernel-configs/rpi-4.1.config
+++ b/kernel-configs/rpi-4.1.config
--- a/kernel-configs/rpi2-4.1.config
+++ b/kernel-configs/rpi2-4.1.config
--- a/mini-x.sh
+++ b/mini-x.sh
@@ -209,7 +209,7 @@ cd ${basedir}

 # Create boot.txt file
 cat << EOF > ${basedir}/bootp/boot.cmd
-setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra}
+setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rootwait panic=10 ${extra} net.ifnames=0 rw rootfstypes=ext4
 fatload mmc 0 0x43000000 script.bin
 fatload mmc 0 0x48000000 uImage
 bootm 0x48000000
--- a/misc/nanopi2/2ndboot.bin
+++ b/misc/nanopi2/2ndboot.bin
--- a/misc/nanopi2/bootloader
+++ b/misc/nanopi2/bootloader
--- a/misc/rpi3/brcmfmac43430-sdio.bin
+++ b/misc/rpi3/brcmfmac43430-sdio.bin
--- a/misc/rpi3/brcmfmac43430-sdio.txt
+++ b/misc/rpi3/brcmfmac43430-sdio.txt
@@ -0,0 +1,66 @@
+# NVRAM file for BCM943430WLPTH
+# 2.4 GHz, 20 MHz BW mode
+
+# The following parameter values are just placeholders, need to be updated.
+manfid=0x2d0
+prodid=0x0727
+vendid=0x14e4
+devid=0x43e2
+boardtype=0x0727
+boardrev=0x1101
+boardnum=22
+macaddr=00:90:4c:c5:12:38
+sromrev=11
+boardflags=0x00404201
+boardflags3=0x08000000
+xtalfreq=37400
+nocrc=1
+ag0=255
+aa2g=1
+ccode=ALL
+
+pa0itssit=0x20
+extpagain2g=0
+#PA parameters for 2.4GHz, measured at CHIP OUTPUT
+pa2ga0=-168,7161,-820
+AvVmid_c0=0x0,0xc8
+cckpwroffset0=5
+
+# PPR params
+maxp2ga0=84
+txpwrbckof=6
+cckbw202gpo=0
+legofdmbw202gpo=0x66111111
+mcsbw202gpo=0x77711111
+propbw202gpo=0xdd
+
+# OFDM IIR :
+ofdmdigfilttype=18
+ofdmdigfilttypebe=18
+# PAPD mode:
+papdmode=1
+papdvalidtest=1
+pacalidx2g=42
+papdepsoffset=-22
+papdendidx=58
+
+# LTECX flags
+ltecxmux=0
+ltecxpadnum=0x0102
+ltecxfnsel=0x44
+ltecxgcigpio=0x01
+
+il0macaddr=00:90:4c:c5:12:38
+wl0id=0x431b
+
+deadman_to=0xffffffff
+# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG
+muxenab=0x1
+# CLDO PWM voltage settings - 0x4 - 1.1 volt
+#cldo_pwm=0x4
+
+#VCO freq 326.4MHz
+spurconfig=0x3 
+
+edonthd20l=-75
+edoffthd20ul=-80
--- a/nanopi2.sh
+++ b/nanopi2.sh
@@ -74,6 +74,16 @@ EOF
 cat << EOF > kali-$architecture/etc/network/interfaces
 auto lo
 iface lo inet loopback
+
+auto eth0
+allow-hotplug eth0
+iface eth0 inet dhcp
+hwaddress 76:92:d4:85:f3:0f
+
+# This prevents NetworkManager from attempting to use this
+# device to connect to wifi, since NM doesn't show which device is which.
+# Unfortunately, it still SHOWS the device, just that it's not managed.
+iface p2p0 inet manual
 EOF

 cat << EOF > kali-$architecture/etc/resolv.conf
@@ -119,9 +129,7 @@ apt-get --yes --force-yes autoremove
 # Because copying in authorized_keys is hard for people to do, let's make the
 # image insecure and enable root login with a password.

-echo "Making the image insecure"
-sed -i -e 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-
+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
 update-rc.d ssh enable

 rm -f /usr/sbin/policy-rc.d
@@ -195,13 +203,16 @@ EOF

 # Kernel section. If you want to use a custom kernel, or configuration, replace
 # them in this section.
-git clone --depth 1 https://github.com/friendlyarm/linux-3.4.y -b s5p4418-nanopi2 ${basedir}/root/usr/src/kernel
+git clone --depth 1 https://github.com/friendlyarm/linux-3.4.y -b nanopi2-lollipop-mr1 ${basedir}/root/usr/src/kernel
 cd ${basedir}/root/usr/src/kernel
 git rev-parse HEAD > ../kernel-at-commit
 touch .scmversion
 export ARCH=arm
 export CROSS_COMPILE=arm-linux-gnueabihf-
 patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/mac80211.patch
+# Ugh, this patch is needed because the ethernet driver uses parts of netdev
+# from a newer kernel?
+patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/0001-Remove-define.patch
 cp ${basedir}/../kernel-configs/nanopi2* ..
 cp ../nanopi2-720p.config .config
 make -j $(grep -c processor /proc/cpuinfo)
--- a/odroid-c.sh
+++ b/odroid-c.sh
@@ -35,7 +35,7 @@ base="e2fsprogs initramfs-tools kali-defaults kali-menu parted sudo usbutils"
 desktop="fonts-croscore fonts-crosextra-caladea fonts-crosextra-carlito gnome-theme-kali gtk3-engines-xfce kali-desktop-xfce kali-root-login lightdm network-manager network-manager-gnome xfce4 xserver-xorg-video-fbdev"
 tools="aircrack-ng ethtool hydra john libnfc-bin mfoc nmap passing-the-hash sqlmap usbutils winexe wireshark"
 services="apache2 openssh-server"
-extras="iceweasel xfce4-terminal wpasupplicant"
+extras="fbset iceweasel xfce4-terminal wpasupplicant"

 packages="${arm} ${base} ${desktop} ${tools} ${services} ${extras}"
 architecture="armhf"
@@ -123,7 +123,7 @@ apt-get --yes --force-yes autoremove
 # image insecure and enable root login with a password.

 echo "Making the image insecure"
-sed -i -e 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config

 update-rc.d ssh enable

@@ -220,37 +220,224 @@ cd ${basedir}
 # Create a boot.ini file with possible options if people want to change them.
 cat << EOF > ${basedir}/bootp/boot.ini
 ODROIDC-UBOOT-CONFIG
- 
+
 # Possible screen resolutions
 # Uncomment only a single Line! The line with setenv written.
 # At least one mode must be selected.
- 
-# setenv m "vga"          # VGA 640x480
-# setenv m "480p"         # 480p 720x480
-# setenv m "576p"         # 576p 720x576
-# setenv m "800x480p60hz" # WVGA 800x480
-# setenv m "720p"         # 720p 1280x720
-# setenv m "800p"         # 800p(WXGA) 1280x800
-# setenv m "sxga"         # SXGA 1280x1024
-setenv m "1080p"        # 1080P 1920x1080
-# setenv m "1920x1200"    # 1920x1200
- 
-# HDMI/DVI Mode Configuration
+
+# setenv m "vga"                # 640x480
+# setenv m "480p"               # 720x480
+# setenv m "576p"               # 720x576
+# setenv m "800x480p60hz"       # 800x480
+# setenv m "800x600p60hz"       # 800x600
+# setenv m "1024x600p60hz"      # 1024x600
+# setenv m "1024x768p60hz"      # 1024x768
+# setenv m "1360x768p60hz"      # 1360x768
+# setenv m "1440x900p60hz"      # 1440x900
+# setenv m "1600x900p60hz"      # 1600x900
+# setenv m "1680x1050p60hz"     # 1680x1050
+# setenv m "720p"               # 720p 1280x720
+# setenv m "800p"               # 1280x800
+# setenv m "sxga"               # 1280x1024
+# setenv m "1080i50hz"          # 1080I@50Hz
+# setenv m "1080p24hz"          # 1080P@24Hz
+# setenv m "1080p50hz"          # 1080P@50Hz
+setenv m "1080p"                # 1080P@60Hz
+# setenv m "1920x1200"          # 1920x1200
+
+# HDMI DVI Mode Configuration
 setenv vout_mode "hdmi"
 # setenv vout_mode "dvi"
- 
+# setenv vout_mode "vga"
+
 # HDMI BPP Mode
 setenv m_bpp "32"
+# setenv m_bpp "24"
 # setenv m_bpp "16"
- 
+
+# HDMI Hotplug Force (HPD)
+# 1 = Enables HOTPlug Detection
+# 0 = Disables HOTPlug Detection and force the connected status
+setenv hpd "0"
+
+# CEC Enable/Disable (Requires Hardware Modification)
+# 1 = Enables HDMI CEC
+# 0 = Disables HDMI CEC
+setenv cec "0"
+
+# PCM5102 I2S Audio DAC
+# PCM5102 is an I2S Audio Dac Addon board for ODROID-C1+
+# Uncomment the line below to __ENABLE__ support for this Addon board.
+# setenv enabledac "enabledac"
+
 # UHS Card Configuration
 # Uncomment the line below to __DISABLE__ UHS-1 MicroSD support
-# This might break boot for some brand/models of cards.
+# This might break boot for some brand models of cards.
 setenv disableuhs "disableuhs"
- 
-setenv bootargs "console=ttyS0,115200n8 root=/dev/mmcblk0p2 rootwait rw no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=\${m} m_bpp=\${m_bpp} vout=\${vout_mode} \${disableuhs}"
-setenv bootcmd "fatload mmc 0:1 0x21000000 uImage; fatload mmc 0:1 0x22000000 uInitrd; fatload mmc 0:1 0x21800000 meson8b_odroidc.dtb; bootm 0x21000000 - 0x21800000"
-run bootcmd
+
+
+# Disable VPU (Video decoding engine, Saves RAM!!!)
+# 0 = disabled
+# 1 = enabled
+setenv vpu "1"
+
+# Disable HDMI Output (Again, saves ram!)
+# 0 = disabled
+# 1 = enabled
+setenv hdmioutput "1"
+
+# Default Console Device Setting
+# setenv condev "console=ttyS0,115200n8"        # on serial port
+# setenv condev "console=tty0"                    # on display (HDMI)
+setenv condev "console=tty0 console=ttyS0,115200n8"   # on both
+
+
+
+###########################################
+
+if test "\${hpd}" = "0"; then setenv hdmi_hpd "disablehpd=true"; fi
+if test "\${cec}" = "1"; then setenv hdmi_cec "hdmitx=cecf"; fi
+
+# Boot Arguments
+setenv bootargs "root=/dev/mmcblk0p2 rootfstype=ext4 quiet rootwait rw \${condev} no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=\${m} m_bpp=\${m_bpp} vout=\${vout_mode} \${disableuhs} \${hdmi_hpd} \${hdmi_cec} \${enabledac} net.ifnames=0"
+
+# Booting
+fatload mmc 0:1 0x21000000 uImage
+fatload mmc 0:1 0x22000000 uInitrd
+fatload mmc 0:1 0x21800000 meson8b_odroidc.dtb
+fdt addr 21800000
+
+if test "\${vpu}" = "0"; then fdt rm /mesonstream; fdt rm /vdec; fdt rm /ppmgr; fi
+
+if test "\${hdmioutput}" = "0"; then fdt rm /mesonfb; fi
+
+# If you're going to use an initrd, uncomment this line and comment out the bottom line.
+#bootm 0x21000000 0x22000000 0x21800000"
+bootm 0x21000000 - 0x21800000"
+EOF
+
+# Create systemd service to setup display.
+cat << EOF > ${basedir}/root/lib/systemd/system/amlogic.service
+[Unit]
+Description=AMlogic HDMI Initialization
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/amlogic.sh
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+# Create symlink to enable the service...
+ln -sf /lib/systemd/system/amlogic.service ${basedir}/root/etc/systemd/system/multi-user.target.wants/amlogic.service
+
+cat << EOF > ${basedir}/root/usr/bin/amlogic.sh
+#!/bin/sh
+
+for x in \$(cat /proc/cmdline); do
+    case \${x} in
+        m_bpp=*) export bpp=\${x#*=} ;;
+        hdmimode=*) export mode=\${x#*=} ;;
+    esac
+done
+
+HPD_STATE=/sys/class/amhdmitx/amhdmitx0/hpd_state
+DISP_CAP=/sys/class/amhdmitx/amhdmitx0/disp_cap
+DISP_MODE=/sys/class/display/mode
+
+hdmi=\`cat \$HPD_STATE\`
+if [ \$hdmi -eq 1 ]; then
+    echo \$mode > \$DISP_MODE
+fi
+
+outputmode=\$mode
+
+common_display_setup() {
+    fbset -fb /dev/fb1 -g 32 32 32 32 32
+    echo \$outputmode > /sys/class/display/mode
+    echo 0 > /sys/class/ppmgr/ppscaler
+    echo 0 > /sys/class/graphics/fb0/free_scale
+    echo 1 > /sys/class/graphics/fb0/freescale_mode
+
+    case \$outputmode in
+            800x480*) M="0 0 799 479" ;;
+            vga*)  M="0 0 639 749" ;;
+            800x600p60*) M="0 0 799 599" ;;
+            1024x600p60h*) M="0 0 1023 599" ;;
+            1024x768p60h*) M="0 0 1023 767" ;;
+            sxga*) M="0 0 1279 1023" ;;
+            1440x900p60*) M="0 0 1439 899" ;;
+            480*) M="0 0 719 479" ;;
+            576*) M="0 0 719 575" ;;
+            720*) M="0 0 1279 719" ;;
+            800*) M="0 0 1279 799" ;;
+            1080*) M="0 0 1919 1079" ;;
+            1920x1200*) M="0 0 1919 1199" ;;
+            1680x1050p60*) M="0 0 1679 1049" ;;
+        1360x768p60*) M="0 0 1359 767" ;;
+        1366x768p60*) M="0 0 1365 767" ;;
+        1600x900p60*) M="0 0 1599 899" ;;
+    esac
+
+    echo \$M > /sys/class/graphics/fb0/free_scale_axis
+    echo \$M > /sys/class/graphics/fb0/window_axis
+    echo 0x10001 > /sys/class/graphics/fb0/free_scale
+    echo 0 > /sys/class/graphics/fb1/free_scale
+}
+
+case \$mode in
+    800x480*)           fbset -fb /dev/fb0 -g 800 480 800 960 \$bpp;     common_display_setup ;;
+    vga*)               fbset -fb /dev/fb0 -g 640 480 640 960 \$bpp;     common_display_setup ;;
+    480*)               fbset -fb /dev/fb0 -g 720 480 720 960 \$bpp;     common_display_setup ;;
+    800x600p60*)        fbset -fb /dev/fb0 -g 800 600 800 1200 \$bpp;    common_display_setup ;;
+    576*)               fbset -fb /dev/fb0 -g 720 576 720 1152 \$bpp;    common_display_setup ;;
+    1024x600p60h*)      fbset -fb /dev/fb0 -g 1024 600 1024 1200 \$bpp;  common_display_setup ;;
+    1024x768p60h*)      fbset -fb /dev/fb0 -g 1024 768 1024 1536 \$bpp;  common_display_setup ;;
+    720*)               fbset -fb /dev/fb0 -g 1280 720 1280 1440 \$bpp;  common_display_setup ;;
+    800*)               fbset -fb /dev/fb0 -g 1280 800 1280 1600 \$bpp;  common_display_setup ;;
+    sxga*)              fbset -fb /dev/fb0 -g 1280 1024 1280 2048 \$bpp; common_display_setup ;;
+    1440x900p60*)       fbset -fb /dev/fb0 -g 1440 900 1440 1800 \$bpp;  common_display_setup ;;
+    1080*)              fbset -fb /dev/fb0 -g 1920 1080 1920 2160 \$bpp; common_display_setup ;;
+    1920x1200*)         fbset -fb /dev/fb0 -g 1920 1200 1920 2400 \$bpp; common_display_setup ;;
+    1360x768p60*)       fbset -fb /dev/fb0 -g 1360 768 1360 1536 \$bpp;  common_display_setup ;;
+    1366x768p60*)       fbset -fb /dev/fb0 -g 1366 768 1366 1536 \$bpp;  common_display_setup ;;
+    1600x900p60*)       fbset -fb /dev/fb0 -g 1600 900 1600 1800 \$bpp;  common_display_setup ;;
+    1680x1050p60*)      fbset -fb /dev/fb0 -g 1680 1050 1680 2100 \$bpp; common_display_setup ;;
+esac
+
+
+# Console unblack
+echo 0 > /sys/class/graphics/fb0/blank
+echo 0 > /sys/class/graphics/fb1/blank
+
+
+# Network Tweaks. Thanks to mlinuxguy
+echo 32768 > /proc/sys/net/core/rps_sock_flow_entries
+echo 2048 > /sys/class/net/eth0/queues/rx-0/rps_flow_cnt
+echo 7 > /sys/class/net/eth0/queues/rx-0/rps_cpus
+echo 7 > /sys/class/net/eth0/queues/tx-0/xps_cpus
+
+# Move IRQ's of ethernet to CPU1/2
+echo 1,2 > /proc/irq/40/smp_affinity_list
+EOF
+chmod +x ${basedir}/root/usr/bin/amlogic.sh
+
+cat << EOF > ${basedir}/root/etc/sysctl.d/99-c1-network.conf
+net.core.rmem_max = 26214400
+net.core.wmem_max = 26214400
+net.core.rmem_default = 514400
+net.core.wmem_default = 514400
+net.ipv4.tcp_rmem = 10240 87380 26214400
+net.ipv4.tcp_wmem = 10240 87380 26214400
+net.ipv4.udp_rmem_min = 131072
+net.ipv4.udp_wmem_min = 131072
+net.ipv4.tcp_timestamps = 1
+net.ipv4.tcp_window_scaling = 1
+net.ipv4.tcp_sack = 1
+net.core.optmem_max = 65535
+net.core.netdev_max_backlog = 5000
 EOF

 rm -rf ${basedir}/root/lib/firmware
--- a/odroid-c2.sh
+++ b/odroid-c2.sh
@@ -0,0 +1,579 @@
+#!/bin/bash
+
+# This is the HardKernel ODROID C2 Kali ARM64 build script - http://hardkernel.com/main/main.php
+# A trusted Kali Linux image created by Offensive Security - http://www.offensive-security.com
+
+if [[ $# -eq 0 ]] ; then
+    echo "Please pass version number, e.g. $0 2.0"
+    exit 0
+fi
+
+basedir=`pwd`/odroidc2-$1
+
+# Make sure that the cross compiler can be found in the path before we do
+# anything else, that way the builds don't fail half way through.
+export CROSS_COMPILE=aarch64-linux-gnu-
+if [ $(compgen -c $CROSS_COMPILE | wc -l) -eq 0 ] ; then
+    echo "Missing cross compiler. Set up PATH according to the README"
+    exit 1
+fi
+# Unset CROSS_COMPILE so that if there is any native compiling needed it doesn't
+# get cross compiled.
+unset CROSS_COMPILE
+
+# Package installations for various sections.
+# This will build a minimal XFCE Kali system with the top 10 tools.
+# This is the section to edit if you would like to add more packages.
+# See http://www.kali.org/new/kali-linux-metapackages/ for meta packages you can
+# use. You can also install packages, using just the package name, but keep in
+# mind that not all packages work on ARM! If you specify one of those, the
+# script will throw an error, but will still continue on, and create an unusable
+# image, keep that in mind.
+
+# The package "fbset" is required to init the display.
+# The video needs to be "kicked" before xorg starts, otherwise the video shows
+# up in a weird state.
+# DO NOT REMOVE IT FROM THE PACKAGE LIST.
+
+#arm="abootimg cgpt fake-hwclock ntpdate u-boot-tools vboot-utils vboot-kernel-utils"
+arm="abootimg fake-hwclock ntpdate u-boot-tools"
+base="e2fsprogs initramfs-tools kali-defaults kali-menu parted sudo usbutils"
+desktop="fonts-croscore fonts-crosextra-caladea fonts-crosextra-carlito gnome-theme-kali gtk3-engines-xfce kali-desktop-xfce kali-root-login lightdm network-manager network-manager-gnome xfce4 xserver-xorg-video-fbdev"
+tools="aircrack-ng ethtool hydra john libnfc-bin mfoc nmap passing-the-hash sqlmap usbutils winexe wireshark"
+services="apache2 openssh-server"
+extras="fbset iceweasel xfce4-terminal wpasupplicant"
+
+packages="${arm} ${base} ${desktop} ${tools} ${services} ${extras}"
+architecture="arm64"
+# If you have your own preferred mirrors, set them here.
+# After generating the rootfs, we set the sources.list to the default settings.
+mirror=http.kali.org
+
+# Set this to use an http proxy, like apt-cacher-ng, and uncomment further down
+# to unset it.
+#export http_proxy="http://localhost:3142/"
+
+mkdir -p ${basedir}
+cd ${basedir}
+
+# create the rootfs - not much to modify here, except maybe the hostname.
+debootstrap --foreign --arch $architecture kali-rolling kali-$architecture http://$mirror/kali
+
+cp /usr/bin/qemu-aarch64-static kali-$architecture/usr/bin/
+
+LANG=C chroot kali-$architecture /debootstrap/debootstrap --second-stage
+cat << EOF > kali-$architecture/etc/apt/sources.list
+deb http://$mirror/kali kali-rolling main contrib non-free
+EOF
+
+echo "kali-arm64" > kali-$architecture/etc/hostname
+
+cat << EOF > kali-$architecture/etc/hosts
+127.0.0.1       kali-arm64    localhost
+::1             localhost ip6-localhost ip6-loopback
+fe00::0         ip6-localnet
+ff00::0         ip6-mcastprefix
+ff02::1         ip6-allnodes
+ff02::2         ip6-allrouters
+EOF
+
+cat << EOF > kali-$architecture/etc/network/interfaces
+auto lo
+iface lo inet loopback
+
+auto eth0
+iface eth0 inet dhcp
+EOF
+
+cat << EOF > kali-$architecture/etc/resolv.conf
+nameserver 8.8.8.8
+EOF
+
+export MALLOC_CHECK_=0 # workaround for LP: #520465
+export LC_ALL=C
+export DEBIAN_FRONTEND=noninteractive
+
+mount -t proc proc kali-$architecture/proc
+mount -o bind /dev/ kali-$architecture/dev/
+mount -o bind /dev/pts kali-$architecture/dev/pts
+
+cat << EOF > kali-$architecture/debconf.set
+console-common console-data/keymap/policy select Select keymap from full list
+console-common console-data/keymap/full select en-latin1-nodeadkeys
+EOF
+
+cat << EOF > kali-$architecture/third-stage
+#!/bin/bash
+dpkg-divert --add --local --divert /usr/sbin/invoke-rc.d.chroot --rename /usr/sbin/invoke-rc.d
+cp /bin/true /usr/sbin/invoke-rc.d
+echo -e "#!/bin/sh\nexit 101" > /usr/sbin/policy-rc.d
+chmod +x /usr/sbin/policy-rc.d
+
+apt-get update
+apt-get --yes --force-yes install locales-all
+
+debconf-set-selections /debconf.set
+rm -f /debconf.set
+apt-get update
+apt-get -y install git-core binutils ca-certificates initramfs-tools u-boot-tools
+apt-get -y install locales console-common less nano git
+echo "root:toor" | chpasswd
+sed -i -e 's/KERNEL\!=\"eth\*|/KERNEL\!=\"/' /lib/udev/rules.d/75-persistent-net-generator.rules
+rm -f /etc/udev/rules.d/70-persistent-net.rules
+export DEBIAN_FRONTEND=noninteractive
+apt-get --yes --force-yes install $packages
+apt-get --yes --force-yes dist-upgrade
+apt-get --yes --force-yes autoremove
+
+# Because copying in authorized_keys is hard for people to do, let's make the
+# image insecure and enable root login with a password.
+
+echo "Making the image insecure"
+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+
+update-rc.d ssh enable
+
+rm -f /usr/sbin/policy-rc.d
+rm -f /usr/sbin/invoke-rc.d
+dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
+
+rm -f /third-stage
+EOF
+
+chmod +x kali-$architecture/third-stage
+LANG=C chroot kali-$architecture /third-stage
+
+cat << EOF > kali-$architecture/cleanup
+#!/bin/bash
+rm -rf /root/.bash_history
+apt-get update
+apt-get clean
+rm -f /0
+rm -f /hs_err*
+rm -f cleanup
+rm -f /usr/bin/qemu*
+EOF
+
+chmod +x kali-$architecture/cleanup
+LANG=C chroot kali-$architecture /cleanup
+
+umount kali-$architecture/proc/sys/fs/binfmt_misc
+umount kali-$architecture/dev/pts
+umount kali-$architecture/dev/
+umount kali-$architecture/proc
+
+# Create the disk and partition it
+echo "Creating image file for ODROID-C2"
+dd if=/dev/zero of=${basedir}/kali-$1-odroidc2.img bs=1M count=7000
+parted kali-$1-odroidc2.img --script -- mklabel msdos
+parted kali-$1-odroidc2.img --script -- mkpart primary fat32 2048s 264191s
+parted kali-$1-odroidc2.img --script -- mkpart primary ext4 264192s 100%
+
+# Set the partition variables
+loopdevice=`losetup -f --show ${basedir}/kali-$1-odroidc2.img`
+device=`kpartx -va $loopdevice| sed -E 's/.*(loop[0-9])p.*/\1/g' | head -1`
+sleep 5
+device="/dev/mapper/${device}"
+bootp=${device}p1
+rootp=${device}p2
+
+# Create file systems
+mkfs.vfat $bootp
+mkfs.ext4 -L rootfs $rootp
+
+# Create the dirs for the partitions and mount them
+mkdir -p ${basedir}/bootp ${basedir}/root
+mount $bootp ${basedir}/bootp
+mount $rootp ${basedir}/root
+
+echo "Rsyncing rootfs into image file"
+rsync -HPavz -q ${basedir}/kali-$architecture/ ${basedir}/root/
+
+cat << EOF > ${basedir}/root/etc/apt/sources.list
+deb http://http.kali.org/kali kali-rolling main non-free contrib
+deb-src http://http.kali.org/kali kali-rolling main non-free contrib
+EOF
+
+# Display is... interesting, thanks Amlogic.
+mkdir -p /usr/share/lightdm/lightdm.conf.d
+cat << EOF > ${basedir}/root/usr/share/lightdm/lightdm.conf.d/10-odroidc2.conf
+[SeatDefaults]
+display-setup-script=/usr/bin/aml_fix_display
+EOF
+
+cat << EOF > ${basedir}/root/usr/bin/aml_fix_display
+#!/bin/bash
+for x in \$(cat /proc/cmdline); do
+        case \${x} in
+                m_bpp=*) export bpp=\${x#*=} ;;
+        esac
+done
+
+if [ "\$bpp" = "32" ]; then
+    echo d01068b4 0x7fc0 > /sys/kernel/debug/aml_reg/paddr
+fi
+EOF
+chmod +x ${basedir}/root/usr/bin/aml_fix_display
+
+# Create systemd service to setup display.
+cat << EOF > ${basedir}/root/lib/systemd/system/amlogic.service
+[Unit]
+Description=AMlogic HDMI Initialization
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/bin/amlogic.sh
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+# Create symlink to enable the service...
+ln -sf /lib/systemd/system/amlogic.service ${basedir}/root/etc/systemd/system/multi-user.target.wants/amlogic.service
+
+cat << EOF > ${basedir}/root/usr/bin/amlogic.sh
+#!/bin/sh
+
+for x in \$(cat /proc/cmdline); do
+        case \${x} in
+                m_bpp=*) export bpp=\${x#*=} ;;
+                hdmimode=*) export mode=\${x#*=} ;;
+        esac
+done
+
+HPD_STATE=/sys/class/amhdmitx/amhdmitx0/hpd_state
+DISP_CAP=/sys/class/amhdmitx/amhdmitx0/disp_cap
+DISP_MODE=/sys/class/display/mode
+
+echo \$mode > \$DISP_MODE
+
+common_display_setup() {
+        M="0 0 \$((\$X - 1)) \$((\$Y - 1))"
+        Y_VIRT=\$((\$Y * 2))
+        fbset -fb /dev/fb0 -g \$X \$Y \$X \$Y_VIRT \$bpp
+        echo \$mode > /sys/class/display/mode
+        echo 0 > /sys/class/graphics/fb0/free_scale
+        echo 1 > /sys/class/graphics/fb0/freescale_mode
+        echo \$M > /sys/class/graphics/fb0/free_scale_axis
+        echo \$M > /sys/class/graphics/fb0/window_axis
+
+        echo 0 > /sys/class/graphics/fb1/free_scale
+        echo 1 > /sys/class/graphics/fb1/freescale_mode
+        if [ "\$bpp" = "32" ]; then
+            echo d01068b4 0x7fc0 > /sys/kernel/debug/aml_reg/paddr
+        fi
+}
+
+case \$mode in
+        480*)
+            export X=720
+            export Y=480
+            ;;
+        576*)
+            export X=720
+            export Y=576
+            ;;
+        720p*)
+            export X=1280
+            export Y=720
+            ;;
+        1080*)
+            export X=1920
+            export Y=1080
+            ;;
+        2160p*)
+            export X=3840
+            export Y=2160
+            ;;
+        smpte24hz*)
+            export X=3840
+            export Y=2160
+            ;;
+        640x480p60hz*)
+            export X=640
+            export Y=480
+            ;;
+        800x480p60hz*)
+            export X=800
+            export Y=480
+            ;;
+        800x600p60hz*)
+            export X=800
+            export Y=600
+            ;;
+        1024x600p60hz*)
+            export X=1024
+            export Y=600
+            ;;
+        1024x768p60hz*)
+            export X=1024
+            export Y=768
+            ;;
+        1280x800p60hz*)
+            export X=1280
+            export Y=800
+            ;;
+        1280x1024p60hz*)
+            export X=1280
+            export Y=1024
+            ;;
+        1360x768p60hz*)
+            export X=1360
+            export Y=768
+            ;;
+        1366x768p60hz*)
+            export X=1366
+            export Y=768
+            ;;
+        1440x900p60hz*)
+            export X=1440
+            export Y=900
+            ;;
+        1600x900p60hz*)
+            export X=1600
+            export Y=900
+            ;;
+        1680x1050p60hz*)
+            export X=1680
+            export Y=1050
+            ;;
+        1920x1200p60hz*)
+            export X=1920
+            export Y=1200
+            ;;
+esac
+
+common_display_setup
+
+# Console unblack
+echo 0 > /sys/class/graphics/fb0/blank
+echo 0 > /sys/class/graphics/fb1/blank
+EOF
+chmod +x ${basedir}/root/usr/bin/amlogic.sh
+
+# And because we need to run c2_init in the initramfs and it calls fbset,
+# create a hook for adding /bin/fbset to the initrd as well.
+cat << EOF > ${basedir}/root/usr/share/initramfs-tools/hooks/fbset
+#!/bin/sh -e
+PREREQS=""
+case \$1 in
+            prereqs) echo "\${PREREQS}"; exit 0;;
+        esac
+        . /usr/share/initramfs-tools/hook-functions
+        copy_exec /bin/fbset /bin
+EOF
+chmod +x ${basedir}/root/usr/share/initramfs-tools/hooks/fbset
+
+# Uncomment this if you use apt-cacher-ng otherwise git clones will fail.
+#unset http_proxy
+
+# Kernel section. If you want to use a custom kernel, or configuration, replace
+# them in this section.
+# For some reason, building the kernel in the image fails claiming it's run out
+# of space - for the moment, let's build the kernel outside of it, but still
+# keep the sources around for those who want/need to build external modules.
+git clone --depth 1 https://github.com/hardkernel/linux -b odroidc2-3.14.y ${basedir}/root/usr/src/kernel
+cd ${basedir}/root/usr/src/kernel
+git rev-parse HEAD > ../kernel-at-commit
+touch .scmversion
+export ARCH=arm64
+export CROSS_COMPILE=aarch64-linux-gnu-
+patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/kali-wifi-injection-3.14.patch
+# Patches for misc fixes
+patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/0001-Bluetooth-allocate-static-minor-for-vhci.patch
+patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/0002-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
+cp ${basedir}/../kernel-configs/odroid-c2.config .config
+cp .config ../odroid-c2.config
+cp -a ${basedir}/root/usr/src/kernel ${basedir}/
+cd ${basedir}/kernel/
+make -j $(grep -c processor /proc/cpuinfo)
+make modules_install INSTALL_MOD_PATH=${basedir}/root
+cp arch/arm64/boot/Image ${basedir}/bootp/
+cp arch/arm64/boot/dts/meson64_odroidc2.dtb ${basedir}/bootp/
+cd ${basedir}/root/usr/src/kernel
+make modules_prepare
+cd ${basedir}
+
+# Create a boot.ini file with possible options if people want to change them.
+# Currently on my only nearby 1080p, I get a display that's only 1024x768 in the
+# upper left corner, so default to 720p which seems to work great.
+cat << EOF > ${basedir}/bootp/boot.ini
+ODROIDC2-UBOOT-CONFIG
+
+# Possible screen resolutions
+# Uncomment only a single Line! The line with setenv written.
+# At least one mode must be selected.
+
+# 480 Lines (720x480)
+# setenv m "480i60hz" # Interlaced 60Hz
+# setenv m "480i_rpt" # Interlaced for Rear Projection Televisions 60Hz
+# setenv m "480p60hz" # 480 Progressive 60Hz
+# setenv m "480p_rpt" # 480 Progressive for Rear Projection Televisions 60Hz
+
+# 576 Lines (720x576)
+# setenv m "576i50hz" # Interlaced 50Hz
+# setenv m "576i_rpt" # Interlaced for Rear Projection Televisions 50Hz
+# setenv m "576p50hz" # Progressive 50Hz
+# setenv m "576p_rpt" # Progressive for Rear Projection Televisions 50Hz
+
+# 720 Lines (1280x720)
+# setenv m "720p50hz" # 50Hz
+# setenv m "720p60hz" # 60Hz
+
+# 1080 Lines (1920x1080)
+# setenv m "1080i60hz" # Interlaced 60Hz
+setenv m "1080p60hz" # Progressive 60Hz
+# setenv m "1080i50hz" # Interlaced 50Hz
+# setenv m "1080p50hz" # Progressive 50Hz
+# setenv m "1080p24hz" # Progressive 24Hz
+
+# 4K (3840x2160)
+# setenv m "2160p30hz"    # Progressive 30Hz
+# setenv m "2160p25hz"    # Progressive 25Hz
+# setenv m "2160p24hz"    # Progressive 24Hz
+# setenv m "smpte24hz"    # Progressive 24Hz SMPTE
+# setenv m "2160p50hz"    # Progressive 50Hz
+# setenv m "2160p60hz"    # Progressive 60Hz
+# setenv m "2160p50hz420" # Progressive 50Hz with YCbCr 4:2:0 (Requires TV/Monitor that supports it)
+# setenv m "2160p60hz420" # Progressive 60Hz with YCbCr 4:2:0 (Requires TV/Monitor that supports it)
+
+### VESA modes ###
+# setenv m "640x480p60hz"
+# setenv m "800x480p60hz"
+# setenv m "800x600p60hz"
+# setenv m "1024x600p60hz"
+# setenv m "1024x768p60hz"  
+# setenv m "1280x800p60hz"
+# setenv m "1280x1024p60hz"
+# setenv m "1360x768p60hz"
+# setenv m "1366x768p60hz"
+# setenv m "1440x900p60hz"
+# setenv m "1600x900p60hz"
+# setenv m "1680x1050p60hz"
+# setenv m "1920x1200p60hz"
+
+
+# HDMI BPP Mode
+setenv m_bpp "32"
+# setenv m_bpp "24"
+# setenv m_bpp "16"
+
+# HDMI DVI/VGA modes
+# Uncomment only a single Line! The line with setenv written.
+# At least one mode must be selected.
+# setenv vout "dvi"
+# setenv vout "vga"
+
+# Default Console Device Setting
+setenv condev "console=ttyS0,115200n8 console=tty0"   # on both
+
+###########################################
+
+# Boot Arguments
+setenv bootargs "root=/dev/mmcblk0p2 quiet rootwait rw \${condev} no_console_suspend hdmimode=\${m} m_bpp=\${m_bpp} vout=\${vout} fsck.fix=yes net.ifnames=0"
+
+# Booting
+
+setenv loadaddr "0x11000000"
+setenv dtb_loadaddr "0x1000000"
+setenv initrd_loadaddr "0x13000000"
+
+# If using an initramfs, uncomment the following line
+fatload mmc 0:1 \${initrd_loadaddr} uInitrd
+fatload mmc 0:1 \${loadaddr} Image
+fatload mmc 0:1 \${dtb_loadaddr} meson64_odroidc2.dtb
+
+# If using an initramfs, uncomment this and comment out bottom.
+booti \${loadaddr} \${initrd_loadaddr} \${dtb_loadaddr}
+#booti \${loadaddr} - \${dtb_loadaddr}
+EOF
+
+cat << EOF > ${basedir}/bootp/mkuinitrd
+#!/bin/bash
+if [ -a /boot/initrd.img-\$(uname -r) ] ; then
+    update-initramfs -u -k \$(uname -r)
+else
+    update-initramfs -c -k \$(uname -r)
+fi
+mkimage -A arm64 -O linux -T ramdisk -C none -a 0 -e 0 -n "uInitrd" -d /boot/initrd.img-\$(uname -r) /boot/uInitrd
+EOF
+
+
+rm -rf ${basedir}/root/lib/firmware
+cd ${basedir}/root/lib
+git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
+rm -rf ${basedir}/root/lib/firmware/.git
+cd ${basedir}
+
+cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
+chmod +x ${basedir}/root/etc/init.d/zram
+
+# Now, to get display working properly, we need an initramfs, so we can run the
+# c2_init.sh file before we launch X.
+# Hack...
+mount --bind ${basedir}/bootp ${basedir}/root/boot
+cp /usr/bin/qemu-aarch64-static ${basedir}/root/usr/bin
+cp /usr/bin/qemu-arm*-static ${basedir}/root/usr/bin
+cat << EOF > ${basedir}/root/create-initrd
+#!/bin/bash
+update-initramfs -c -k 3.14.29
+mkimage -A arm64 -O linux -T ramdisk -C none -a 0 -e 0 -n "uInitrd" -d /boot/initrd.img-3.14.29 /boot/uInitrd
+rm -f /create-initrd
+rm -f /usr/bin/qemu-*
+EOF
+chmod +x ${basedir}/root/create-initrd
+LANG=C chroot ${basedir}/root /create-initrd
+umount ${basedir}/root/boot
+
+# Unmount partitions
+umount $bootp
+umount $rootp
+kpartx -dv $loopdevice
+
+# Currently we use pre-built, because (again) Amlogic do some funky stuff.
+# The steps for building yourself can be found at:
+# http://odroid.com/dokuwiki/doku.php?id=en:c2_building_u-boot
+# Because it requires a different toolchain to be downloaded and used, we went
+# with the pre-built so as to save people bandwidth, but the steps are here.
+
+#wget https://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-none-elf-4.9-2014.09_linux.tar.xz
+#mkdir -p /opt/toolchains
+#tar xvf gcc-linaro-aarch64-none-elf-4.9-2014.09_linux.tar.xz -C /opt/toolchains/
+#export PATH=/opt/toolchains/gcc-linaro-aarch64-none-elf-4.9-2014.09_linux/bin/:$PATH
+#git clone --depth 1 https://github.com/hardkernel/u-boot -b odroidc2-v2015.01
+#cd ${basedir}/u-boot
+#make CROSS_COMPILE=aarch64-linux-gnu- odroidc2_config
+#make CROSS_COMPILE=aarch64-linux-gnu- -j $(grep -c processor /proc/cpuinfo)
+
+mkdir -p ${basedir}/u-boot
+cd ${basedir}/u-boot
+wget http://odroid.in/mirror/dn.odroid.com/S905/BootLoader/ODROID-C2/c2_bootloader.tar.gz
+tar -xf c2_bootloader.tar.gz
+cd c2_bootloader
+sh sd_fusing.sh $loopdevice
+cd ${basedir}
+
+losetup -d $loopdevice
+
+# Clean up all the temporary build stuff and remove the directories.
+# Comment this out to keep things around if you want to see what may have gone
+# wrong.
+echo "Clean up the build system"
+rm -rf ${basedir}/kernel ${basedir}/bootp ${basedir}/root ${basedir}/kali-$architecture ${basedir}/patches ${basedir}/u-boot
+
+# If you're building an image for yourself, comment all of this out, as you
+# don't need the sha1sum or to compress the image, since you will be testing it
+# soon.
+echo "Generating sha1sum for kali-$1-odroidc2.img"
+sha1sum kali-$1-odroidc2.img > ${basedir}/kali-$1-odroidc2.img.sha1sum
+# Don't pixz on 32bit, there isn't enough memory to compress the images.
+MACHINE_TYPE=`uname -m`
+if [ ${MACHINE_TYPE} == 'x86_64' ]; then
+echo "Compressing kali-$1-odroidc2.img"
+pixz ${basedir}/kali-$1-odroidc2.img ${basedir}/kali-$1-odroidc2.img.xz
+echo "Deleting kali-$1-odroidc2.img"
+rm ${basedir}/kali-$1-odroidc2.img
+echo "Generating sha1sum for kali-$1-odroidc2.img"
+sha1sum kali-$1-odroidc2.img.xz > ${basedir}/kali-$1-odroidc2.img.xz.sha1sum
+fi
--- a/odroid-u2.sh
+++ b/odroid-u2.sh
@@ -242,7 +242,7 @@ EOF

 # Kernel section. If you want to use a custom kernel, or configuration, replace
 # them in this section.
-git clone --depth 1 https://github.com/hardkernel/linux.git -b odroid-3.8.y ${basedir}/kernel
+git clone --depth 1 https://github.com/hardkernel/linux.git -b odroid-3.8.y ${basedir}/root/usr/src/kernel
 cd ${basedir}/root/usr/src/kernel
 git rev-parse HEAD > ../kernel-at-commit
 touch .scmversion
@@ -265,7 +265,7 @@ cat << EOF > ${basedir}/bootp/boot.txt
 setenv initrd_high "0xffffffff"
 setenv fdt_high "0xffffffff"
 setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootm 0x40008000 0x42000000"
-setenv bootargs "console=tty1 console=ttySAC1,115200n8 root=/dev/mmcblk0p2 rootwait mem=2047M"
+setenv bootargs "console=tty1 console=ttySAC1,115200n8 root=/dev/mmcblk0p2 rootwait mem=2047M rw rootfstype=ext4 net.ifnames=0"
 boot
 EOF

--- a/odroid-w-devkit.sh
+++ b/odroid-w-devkit.sh
@@ -31,9 +31,9 @@ packages="${arm} ${base} ${desktop} ${tools} ${services} ${extras}"
 architecture="armel"
 # If you have your own preferred mirrors, set them here.
 # After generating the rootfs, we set the sources.list to the default settings.
-mirror=http.kali.org
+mirror=repo.kali.org

-# Check to ensure that the architecture is set to ARMEL since the RPi is the
+# Check to ensure that the architecture is set to ARMEL since the ODWK is the
 # only board that is armel.
 if [[ $architecture != "armel" ]] ; then
    echo "The ODROID-W cannot run the Debian armhf binaries"
@@ -118,6 +118,7 @@ apt-get --yes --force-yes install $packages
 apt-get --yes --force-yes dist-upgrade
 apt-get --yes --force-yes autoremove

+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
 update-rc.d ssh enable

 rm -f /usr/sbin/policy-rc.d
@@ -189,33 +190,39 @@ EOF

 # Kernel section. If you want to use a custom kernel, or configuration, replace
 # them in this section.
-git clone --depth 1 https://github.com/raspberrypi/linux -b rpi-4.0.y ${basedir}/root/usr/src/kernel
+git clone --depth 1 https://github.com/raspberrypi/linux -b rpi-4.1.y ${basedir}/root/usr/src/kernel
 git clone --depth 1 https://github.com/raspberrypi/tools ${basedir}/tools

 cd ${basedir}/root/usr/src/kernel
 git rev-parse HEAD > ../kernel-at-commit
-patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/kali-wifi-injection-4.0.patch
+patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/kali-wifi-injection-4.1.patch
 touch .scmversion
 export ARCH=arm
 export CROSS_COMPILE=${basedir}/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-
-cp ${basedir}/../kernel-configs/rpi-4.0.config .config
-cp ${basedir}/../kernel-configs/rpi-4.0.config ../rpi-4.0.config
+cp ${basedir}/../kernel-configs/rpi-4.1.config .config
+cp ${basedir}/../kernel-configs/rpi-4.1.config ../rpi-4.1.config
 make -j $(grep -c processor /proc/cpuinfo)
 make modules_install INSTALL_MOD_PATH=${basedir}/root
 git clone --depth 1 https://github.com/raspberrypi/firmware.git rpi-firmware
 cp -rf rpi-firmware/boot/* ${basedir}/bootp/
+rm -rf rpi-firmware
+rm -rf ${basedir}/root/lib/firmware
+cd ${basedir}/root/lib
+git clone --depth 1 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
+rm -rf ${basedir}/root/lib/firmware/.git
+cd ${basedir}/root/usr/src/kernel
 cp arch/arm/boot/zImage ${basedir}/bootp/kernel.img
-mkdir ${basedir}/bootp/overlays/
+mkdir -p ${basedir}/bootp/overlays/
 cp arch/arm/boot/dts/bcm*.dtb ${basedir}/bootp/
 cp arch/arm/boot/dts/overlays/*overlay*.dtb ${basedir}/bootp/overlays/
 make mrproper
-cp ../rpi-4.0.config .config
+cp ../rpi-4.1.config .config
 make modules_prepare
 cd ${basedir}

 # Create cmdline.txt file
 cat << EOF > ${basedir}/bootp/cmdline.txt
-dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 elevator=deadline root=/dev/mmcblk0p2 rootfstype=ext4 rootwait fbcon=map:10
+dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 elevator=deadline root=/dev/mmcblk0p2 rootfstype=ext4 rootwait fbcon=map:10 net.ifnames=0 rw
 EOF

 # Create config.txt file
@@ -284,16 +291,6 @@ cat << EOF > ${basedir}/root/etc/modprobe.d/fbtft_device.conf
 options fbtft_device name=adafruit22a rotate=90
 EOF

-rm -rf ${basedir}/root/lib/firmware
-cd ${basedir}/root/lib
-git clone --depth 1 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
-rm -rf ${basedir}/root/lib/firmware/.git
-
-# rpi-wiggle
-mkdir -p ${basedir}/root/scripts
-wget https://raw.github.com/dweeber/rpiwiggle/master/rpi-wiggle -O ${basedir}/root/scripts/rpi-wiggle.sh
-chmod 755 ${basedir}/root/scripts/rpi-wiggle.sh
-
 cd ${basedir}

 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
--- a/odroid-w.sh
+++ b/odroid-w.sh
@@ -25,7 +25,7 @@ desktop="fonts-croscore fonts-crosextra-caladea fonts-crosextra-carlito gnome-th
 tools="aircrack-ng ethtool hydra john libnfc-bin mfoc nmap passing-the-hash sqlmap usbutils winexe wireshark"
 services="apache2 openssh-server"
 extras="iceweasel xfce4-terminal wpasupplicant"
-size=3000 # Size of image in megabytes
+size=7000 # Size of image in megabytes

 packages="${arm} ${base} ${desktop} ${tools} ${services} ${extras}"
 architecture="armel"
@@ -204,6 +204,7 @@ make -j $(grep -c processor /proc/cpuinfo)
 make modules_install INSTALL_MOD_PATH=${basedir}/root
 git clone --depth 1 https://github.com/raspberrypi/firmware.git rpi-firmware
 cp -rf rpi-firmware/boot/* ${basedir}/bootp/
+rm -rf rpi-firmware
 cp arch/arm/boot/zImage ${basedir}/bootp/kernel.img
 make mrproper
 cp ../odroid-w.config .config
@@ -212,7 +213,7 @@ cd ${basedir}

 # Create cmdline.txt file
 cat << EOF > ${basedir}/bootp/cmdline.txt
-dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 elevator=deadline root=/dev/mmcblk0p2 rootfstype=ext4 rootwait
+dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 elevator=deadline root=/dev/mmcblk0p2 rootfstype=ext4 rootwait net.ifnames=0 rw
 EOF

 rm -rf ${basedir}/root/lib/firmware
--- a/odroid-xu.sh
+++ b/odroid-xu.sh
@@ -261,7 +261,7 @@ setenv fb_x_res "1280"
 setenv fb_y_res "720"
 setenv hdmi_phy_res "720"
 setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootz 0x40008000 0x42000000"
-setenv bootargs "console=tty1 console=ttySAC2,115200n8 vmalloc=512M fb_x_res=${fb_x_res} fb_y_res=${fb_y_res} hdmi_phy_res=${hdmi_phy_res} vout=hdmi led_blink=1 fake_fb=true root=/dev/mmcblk0p2 rootwait"
+setenv bootargs "console=tty1 console=ttySAC2,115200n8 vmalloc=512M fb_x_res=\${fb_x_res} fb_y_res=\${fb_y_res} hdmi_phy_res=\${hdmi_phy_res} vout=hdmi led_blink=1 fake_fb=true root=/dev/mmcblk0p2 rootwait rootfstype=ext4 rw net.ifnames=0"
 boot
 EOF

@@ -272,7 +272,7 @@ setenv fb_x_res "1920"
 setenv fb_y_res "1080"
 setenv hdmi_phy_res "1080"
 setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; bootz 0x40008000 0x42000000"
-setenv bootargs "console=tty1 console=ttySAC2,115200n8 vmalloc=512M fb_x_res=${fb_x_res} fb_y_res=${fb_y_res} hdmi_phy_res=${hdmi_phy_res} vout=hdmi led_blink=1 fake_fb=true root=/dev/mmcblk0p2 rootwait ro"
+setenv bootargs "console=tty1 console=ttySAC2,115200n8 vmalloc=512M fb_x_res=\${fb_x_res} fb_y_res=\${fb_y_res} hdmi_phy_res=\${hdmi_phy_res} vout=hdmi led_blink=1 fake_fb=true root=/dev/mmcblk0p2 rootwait rw rootfstype=ext4 net.ifnames=0"
 boot
 EOF

--- a/odroid-xu3.sh
+++ b/odroid-xu3.sh
@@ -239,7 +239,7 @@ setenv macaddr "00:1e:06:61:7a:39"
 #------------------------------------------------------------------------------------------------------
 # Basic Ubuntu Setup. Don't touch unless you know what you are doing.
 # --------------------------------
-setenv bootrootfs "console=tty1 console=ttySAC2,115200n8 root=/dev/mmcblk0p2 rootwait"
+setenv bootrootfs "console=tty1 console=ttySAC2,115200n8 root=/dev/mmcblk0p2 rootwait rootfstype=ext4 net.ifnames=0"

 # boot commands
 setenv bootcmd "fatload mmc 0:1 0x40008000 zImage; fatload mmc 0:1 0x42000000 uInitrd; fatload mmc 0:1 0x44000000 exynos5422-odroidxu3.dtb; bootz 0x40008000 0x42000000 0x44000000"
--- a/patches/0001-Bluetooth-allocate-static-minor-for-vhci.patch
+++ b/patches/0001-Bluetooth-allocate-static-minor-for-vhci.patch
@@ -0,0 +1,74 @@
+From 895b628312862549fb6a037c54b55d0f3b3bbffb Mon Sep 17 00:00:00 2001
+From: Lucas De Marchi <lucas.demarchi@intel.com>
+Date: Tue, 18 Feb 2014 02:19:26 -0300
+Subject: [PATCH 1/2] Bluetooth: allocate static minor for vhci
+
+Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI
+driver) added the module alias to hci_vhci module so it's possible to
+create the /dev/vhci node. However creating an alias without
+specifying the minor doesn't allow us to create the node ahead,
+triggerring module auto-load when it's first accessed.
+
+Starting with depmod from kmod 16 we started to warn if there's a
+devname alias without specifying the major and minor.
+
+Let's do the same done for uhid, kvm, fuse and others, specifying a
+fixed minor. In systems with systemd as the init the following will
+happen: on early boot systemd will call "kmod static-nodes" to read
+/lib/modules/$(uname -r)/modules.devname and then create the nodes. When
+first accessed these "dead" nodes will trigger the module loading.
+
+Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
+Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+---
+ Documentation/devices.txt    | 1 +
+ drivers/bluetooth/hci_vhci.c | 3 ++-
+ include/linux/miscdevice.h   | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Documentation/devices.txt b/Documentation/devices.txt
+index 10378cc..04356f5 100644
+--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
+@@ -353,6 +353,7 @@ Your cooperation is appreciated.
+ 		133 = /dev/exttrp	External device trap
+ 		134 = /dev/apm_bios	Advanced Power Management BIOS
+ 		135 = /dev/rtc		Real Time Clock
+		137 = /dev/vhci		Bluetooth virtual HCI driver
+ 		139 = /dev/openprom	SPARC OpenBoot PROM
+ 		140 = /dev/relay8	Berkshire Products Octal relay card
+ 		141 = /dev/relay16	Berkshire Products ISO-16 relay card
+diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
+index 1ef6990..add1c6a 100644
+--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
+@@ -359,7 +359,7 @@ static const struct file_operations vhci_fops = {
+ static struct miscdevice vhci_miscdev= {
+ 	.name	= "vhci",
+ 	.fops	= &vhci_fops,
+-	.minor	= MISC_DYNAMIC_MINOR,
+	.minor	= VHCI_MINOR,
+ };
+ 
+ static int __init vhci_init(void)
+@@ -385,3 +385,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
+ MODULE_VERSION(VERSION);
+ MODULE_LICENSE("GPL");
+ MODULE_ALIAS("devname:vhci");
+MODULE_ALIAS_MISCDEV(VHCI_MINOR);
+diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
+index 3737f72..7bb6148 100644
+--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
+@@ -23,6 +23,7 @@
+ #define TEMP_MINOR		131	/* Temperature Sensor */
+ #define RTC_MINOR		135
+ #define EFI_RTC_MINOR		136	/* EFI Time services */
+#define VHCI_MINOR		137
+ #define SUN_OPENPROM_MINOR	139
+ #define DMAPI_MINOR		140	/* DMAPI */
+ #define NVRAM_MINOR		144
+-- 
+2.7.0
+
--- a/patches/0001-Remove-define.patch
+++ b/patches/0001-Remove-define.patch
@@ -0,0 +1,28 @@
+From 6d9ba50e3d79a26f80a3bc828c7997398be00e84 Mon Sep 17 00:00:00 2001
+From: Steev Klimaszewski <threeway@gmail.com>
+Date: Wed, 16 Mar 2016 15:19:36 -0500
+Subject: [PATCH] Remove define
+
+This define is used for vlan bits, however, nexell seems to be using a driver
+from a newer version of the kernel and the rest of the netdev bits aren't added
+so just remove this for now.
+---
+ drivers/net/ethernet/nexell/nxpmac/common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/ethernet/nexell/nxpmac/common.h b/drivers/net/ethernet/nexell/nxpmac/common.h
+index 21cb071..170e041 100644
+--- a/drivers/net/ethernet/nexell/nxpmac/common.h
+++ b/drivers/net/ethernet/nexell/nxpmac/common.h
+@@ -31,7 +31,7 @@
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+-#define NXPMAC_VLAN_TAG_USED
+//#define NXPMAC_VLAN_TAG_USED
+ #include <linux/if_vlan.h>
+ #endif
+ 
+-- 
+2.1.4
+
--- a/patches/0002-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
+++ b/patches/0002-KEYS-Fix-keyring-ref-leak-in-join_session_keyring.patch
@@ -0,0 +1,84 @@
+From 7ffe3b6e83dd235fbc3608d19bfadca7ecceb46e Mon Sep 17 00:00:00 2001
+From: Yevgeny Pats <yevgeny@perception-point.io>
+Date: Tue, 19 Jan 2016 22:09:04 +0000
+Subject: [PATCH 2/2] KEYS: Fix keyring ref leak in join_session_keyring()
+
+commit 23567fd052a9abb6d67fe8e7a9ccdd9800a540f2 upstream.
+
+This fixes CVE-2016-0728.
+
+If a thread is asked to join as a session keyring the keyring that's already
+set as its session, we leak a keyring reference.
+
+This can be tested with the following program:
+
+	#include <stddef.h>
+	#include <stdio.h>
+	#include <sys/types.h>
+	#include <keyutils.h>
+
+	int main(int argc, const char *argv[])
+	{
+		int i = 0;
+		key_serial_t serial;
+
+		serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
+				"leaked-keyring");
+		if (serial < 0) {
+			perror("keyctl");
+			return -1;
+		}
+
+		if (keyctl(KEYCTL_SETPERM, serial,
+			   KEY_POS_ALL | KEY_USR_ALL) < 0) {
+			perror("keyctl");
+			return -1;
+		}
+
+		for (i = 0; i < 100; i++) {
+			serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
+					"leaked-keyring");
+			if (serial < 0) {
+				perror("keyctl");
+				return -1;
+			}
+		}
+
+		return 0;
+	}
+
+If, after the program has run, there something like the following line in
+/proc/keys:
+
+3f3d898f I--Q---   100 perm 3f3f0000     0     0 keyring   leaked-keyring: empty
+
+with a usage count of 100 * the number of times the program has been run,
+then the kernel is malfunctioning.  If leaked-keyring has zero usages or
+has been garbage collected, then the problem is fixed.
+
+Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
+Signed-off-by: David Howells <dhowells@redhat.com>
+Acked-by: Don Zickus <dzickus@redhat.com>
+Acked-by: Prarit Bhargava <prarit@redhat.com>
+Acked-by: Jarod Wilson <jarod@redhat.com>
+Signed-off-by: James Morris <james.l.morris@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ security/keys/process_keys.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
+index 0cf8a13..4e56371 100644
+--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
+@@ -793,6 +793,7 @@ long join_session_keyring(const char *name)
+ 		ret = PTR_ERR(keyring);
+ 		goto error2;
+ 	} else if (keyring == new->session_keyring) {
+		key_put(keyring);
+ 		ret = 0;
+ 		goto error2;
+ 	}
+-- 
+2.7.0
+
--- a/patches/kali-wifi-injection-3.14.patch
+++ b/patches/kali-wifi-injection-3.14.patch
@@ -0,0 +1,131 @@
+--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
+@@ -251,8 +251,18 @@ static void rtl8187_tx(struct ieee80211_
+ 	flags |= RTL818X_TX_DESC_FLAG_NO_ENC;
+ 
+ 	flags |= ieee80211_get_tx_rate(dev, info)->hw_value << 24;
+	
+	// When this flag is set the firmware waits untill ALL fragments have
+	// reached the USB device. Then it sends the first fragment and waits
+	// for ACKS's. Of course in monitor mode it won't detect these ACK's.
+ 	if (ieee80211_has_morefrags(tx_hdr->frame_control))
+-		flags |= RTL818X_TX_DESC_FLAG_MOREFRAG;
+	{
+		// If info->control.vif is NULL it's most likely in monitor mode
+		if (likely(info->control.vif != NULL && info->control.vif->type != NL80211_IFTYPE_MONITOR)) {
+			flags |= RTL818X_TX_DESC_FLAG_MOREFRAG;
+		}
+	}
+
+ 	if (info->control.rates[0].flags & IEEE80211_TX_RC_USE_RTS_CTS) {
+ 		flags |= RTL818X_TX_DESC_FLAG_RTS;
+ 		flags |= ieee80211_get_rts_cts_rate(dev, info)->hw_value << 19;
+--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
+@@ -839,7 +839,8 @@ static int ieee80211_set_monitor_channel
+ 			ret = ieee80211_vif_use_channel(sdata, chandef,
+ 					IEEE80211_CHANCTX_EXCLUSIVE);
+ 		}
+-	} else if (local->open_count == local->monitors) {
+       // Patch: Always allow channel change, even if a normal virtual interface is present
+       } else /*if (local->open_count == local->monitors)*/ {
+ 		local->_oper_chandef = *chandef;
+ 		ieee80211_hw_config(local, 0);
+ 	}
+--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
+@@ -784,11 +784,19 @@ ieee80211_tx_h_sequence(struct ieee80211
+ 
+ 	/*
+ 	 * Packet injection may want to control the sequence
+-	 * number, if we have no matching interface then we
+-	 * neither assign one ourselves nor ask the driver to.
+	 * number, so if an injected packet is found, skip
+	 * renumbering it. Also make the packet NO_ACK to avoid
+	 * excessive retries (ACKing and retrying should be
+	 * handled by the injecting application).
+	 * FIXME This may break hostapd and some other injectors.
+	 * This should be done using a radiotap flag.
+ 	 */
+-	if (unlikely(info->control.vif->type == NL80211_IFTYPE_MONITOR))
+	if (unlikely((info->flags & IEEE80211_TX_CTL_INJECTED) &&
+	   !(tx->sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES))) {
+		if (!ieee80211_has_morefrags(hdr->frame_control))
+			info->flags |= IEEE80211_TX_CTL_NO_ACK;
+ 		return TX_CONTINUE;
+	}
+ 
+ 	if (unlikely(ieee80211_is_ctl(hdr->frame_control)))
+ 		return TX_CONTINUE;
+@@ -1530,7 +1538,10 @@ void ieee80211_xmit(struct ieee80211_sub
+ 		}
+ 	}
+ 
+-	ieee80211_set_qos_hdr(sdata, skb);
+       // Don't overwrite QoS header in monitor mode
+       if (likely(info->control.vif->type != NL80211_IFTYPE_MONITOR)) {
+               ieee80211_set_qos_hdr(sdata, skb);
+       }
+ 	ieee80211_tx(sdata, skb, false, band);
+ }
+ 
+--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
+@@ -633,8 +633,10 @@ int cfg80211_set_monitor_channel(struct
+ {
+ 	if (!rdev->ops->set_monitor_channel)
+ 		return -EOPNOTSUPP;
+-	if (!cfg80211_has_monitors_only(rdev))
+-		return -EBUSY;
+	// Always allow user to change channel, even if there is another normal
+	// virtual interface using the device.
+	//if (!cfg80211_has_monitors_only(rdev))
+	//	return -EBUSY;
+ 
+ 	return rdev_set_monitor_channel(rdev, chandef);
+ }
+--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
+@@ -242,14 +242,19 @@ void zd_mac_clear(struct zd_mac *mac)
+ static int set_rx_filter(struct zd_mac *mac)
+ {
+ 	unsigned long flags;
+-	u32 filter = STA_RX_FILTER;
+	struct zd_ioreq32 ioreqs[] = {
+		{CR_RX_FILTER, STA_RX_FILTER},
+		{ CR_SNIFFER_ON, 0U },
+	};
+ 
+ 	spin_lock_irqsave(&mac->lock, flags);
+-	if (mac->pass_ctrl)
+-		filter |= RX_FILTER_CTRL;
+	if (mac->pass_ctrl) {
+		ioreqs[0].value |= 0xFFFFFFFF;
+		ioreqs[1].value = 0x1;
+	}
+ 	spin_unlock_irqrestore(&mac->lock, flags);
+ 
+-	return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter);
+	return zd_iowrite32a(&mac->chip, ioreqs, ARRAY_SIZE(ioreqs));
+ }
+ 
+ static int set_mac_and_bssid(struct zd_mac *mac)
+@@ -1057,7 +1062,8 @@ int zd_mac_rx(struct ieee80211_hw *hw, c
+ 	/* Caller has to ensure that length >= sizeof(struct rx_status). */
+ 	status = (struct rx_status *)
+ 		(buffer + (length - sizeof(struct rx_status)));
+-	if (status->frame_status & ZD_RX_ERROR) {
+	if ((status->frame_status & ZD_RX_ERROR) || 
+		(status->frame_status & ~0x21)) {
+ 		if (mac->pass_failed_fcs &&
+ 				(status->frame_status & ZD_RX_CRC32_ERROR)) {
+ 			stats.flag |= RX_FLAG_FAILED_FCS_CRC;
+@@ -1398,7 +1404,7 @@ struct ieee80211_hw *zd_mac_alloc_hw(str
+ 	hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &mac->band;
+ 
+ 	hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
+-		    IEEE80211_HW_SIGNAL_UNSPEC |
+		    IEEE80211_HW_SIGNAL_DBM |
+ 		    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
+ 		    IEEE80211_HW_MFP_CAPABLE;
+ 
--- a/patches/kali-wifi-injection-4.1.patch
+++ b/patches/kali-wifi-injection-4.1.patch
@@ -0,0 +1,130 @@
+--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
+@@ -582,7 +582,8 @@ static int ieee80211_set_monitor_channel
+ 			ret = ieee80211_vif_use_channel(sdata, chandef,
+ 					IEEE80211_CHANCTX_EXCLUSIVE);
+ 		}
+-	} else if (local->open_count == local->monitors) {
+       // Patch: Always allow channel change, even if a normal virtual interface is present
+       } else /*if (local->open_count == local->monitors)*/ {
+ 		local->_oper_chandef = *chandef;
+ 		ieee80211_hw_config(local, 0);
+ 	}
+--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
+@@ -788,11 +788,19 @@ ieee80211_tx_h_sequence(struct ieee80211
+ 
+ 	/*
+ 	 * Packet injection may want to control the sequence
+-	 * number, if we have no matching interface then we
+-	 * neither assign one ourselves nor ask the driver to.
+	 * number, so if an injected packet is found, skip
+	 * renumbering it. Also make the packet NO_ACK to avoid
+	 * excessive retries (ACKing and retrying should be
+	 * handled by the injecting application).
+	 * FIXME This may break hostapd and some other injectors.
+	 * This should be done using a radiotap flag.
+ 	 */
+-	if (unlikely(info->control.vif->type == NL80211_IFTYPE_MONITOR))
+	if (unlikely((info->flags & IEEE80211_TX_CTL_INJECTED) &&
+	   !(tx->sdata->u.mntr_flags & MONITOR_FLAG_COOK_FRAMES))) {
+		if (!ieee80211_has_morefrags(hdr->frame_control))
+			info->flags |= IEEE80211_TX_CTL_NO_ACK;
+ 		return TX_CONTINUE;
+	}
+ 
+ 	if (unlikely(ieee80211_is_ctl(hdr->frame_control)))
+ 		return TX_CONTINUE;
+@@ -1651,7 +1659,10 @@ void ieee80211_xmit(struct ieee80211_sub
+ 		}
+ 	}
+ 
+-	ieee80211_set_qos_hdr(sdata, skb);
+        // Don't overwrite QoS header in monitor mode
+        if (likely(info->control.vif->type != NL80211_IFTYPE_MONITOR)) {
+            ieee80211_set_qos_hdr(sdata, skb);
+        }
+ 	ieee80211_tx(sdata, sta, skb, false);
+ }
+ 
+--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
+@@ -819,8 +819,10 @@ int cfg80211_set_monitor_channel(struct
+ {
+ 	if (!rdev->ops->set_monitor_channel)
+ 		return -EOPNOTSUPP;
+-	if (!cfg80211_has_monitors_only(rdev))
+-		return -EBUSY;
+	// Always allow user to change channel, even if there is another normal
+	// virtual interface using the device.
+	//if (!cfg80211_has_monitors_only(rdev))
+	//	return -EBUSY;
+ 
+ 	return rdev_set_monitor_channel(rdev, chandef);
+ }
+--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
+@@ -242,14 +242,19 @@ void zd_mac_clear(struct zd_mac *mac)
+ static int set_rx_filter(struct zd_mac *mac)
+ {
+ 	unsigned long flags;
+-	u32 filter = STA_RX_FILTER;
+	struct zd_ioreq32 ioreqs[] = {
+		{CR_RX_FILTER, STA_RX_FILTER},
+		{ CR_SNIFFER_ON, 0U },
+	};
+ 
+ 	spin_lock_irqsave(&mac->lock, flags);
+-	if (mac->pass_ctrl)
+-		filter |= RX_FILTER_CTRL;
+	if (mac->pass_ctrl) {
+		ioreqs[0].value |= 0xFFFFFFFF;
+		ioreqs[1].value = 0x1;
+	}
+ 	spin_unlock_irqrestore(&mac->lock, flags);
+ 
+-	return zd_iowrite32(&mac->chip, CR_RX_FILTER, filter);
+	return zd_iowrite32a(&mac->chip, ioreqs, ARRAY_SIZE(ioreqs));
+ }
+ 
+ static int set_mac_and_bssid(struct zd_mac *mac)
+@@ -1057,7 +1062,8 @@ int zd_mac_rx(struct ieee80211_hw *hw, c
+ 	/* Caller has to ensure that length >= sizeof(struct rx_status). */
+ 	status = (struct rx_status *)
+ 		(buffer + (length - sizeof(struct rx_status)));
+-	if (status->frame_status & ZD_RX_ERROR) {
+	if ((status->frame_status & ZD_RX_ERROR) || 
+		(status->frame_status & ~0x21)) {
+ 		if (mac->pass_failed_fcs &&
+ 				(status->frame_status & ZD_RX_CRC32_ERROR)) {
+ 			stats.flag |= RX_FLAG_FAILED_FCS_CRC;
+@@ -1398,7 +1404,7 @@ struct ieee80211_hw *zd_mac_alloc_hw(str
+ 	hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &mac->band;
+ 
+ 	hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
+-		    IEEE80211_HW_SIGNAL_UNSPEC |
+		    IEEE80211_HW_SIGNAL_DBM |
+ 		    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
+ 		    IEEE80211_HW_MFP_CAPABLE;
+ 
+--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
+@@ -251,8 +251,17 @@ static void rtl8187_tx(struct ieee80211_
+ 	flags |= RTL818X_TX_DESC_FLAG_NO_ENC;
+ 
+ 	flags |= ieee80211_get_tx_rate(dev, info)->hw_value << 24;
+
+	// When this flag is set the firmware waits untill ALL fragments have
+	// reached the USB device. Then it sends the first fragment and waits
+	// for ACKS's. Of course in monitor mode it won't detect these ACK's.
+ 	if (ieee80211_has_morefrags(tx_hdr->frame_control))
+-		flags |= RTL818X_TX_DESC_FLAG_MOREFRAG;
+	{
+		// If info->control.vif is NULL it's most likely in monitor mode
+		if (likely(info->control.vif != NULL && info->control.vif->type != NL80211_IFTYPE_MONITOR)) {
+			flags |= RTL818X_TX_DESC_FLAG_MOREFRAG;
+		}
+	}
+ 
+ 	/* HW will perform RTS-CTS when only RTS flags is set.
+ 	 * HW will perform CTS-to-self when both RTS and CTS flags are set.
--- a/riot.sh
+++ b/riot.sh
@@ -120,6 +120,12 @@ apt-get --yes --force-yes install $packages
 apt-get --yes --force-yes dist-upgrade
 apt-get --yes --force-yes autoremove

+# Because copying in authorized_keys is hard for people to do, let's make the
+# image insecure and enable root login with a password.
+
+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+update-rc.d ssh enable
+
 rm -f /usr/sbin/policy-rc.d
 rm -f /usr/sbin/invoke-rc.d
 dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
@@ -242,7 +248,7 @@ kaddr=0x12000000

 loadkernel=load \${dtype} \${disk}:1 \${loadaddr} zImage

-bargs=setenv bootargs console=ttymxc1,115200n8 rootwait root=PARTUUID=\${btpart}
+bargs=setenv bootargs console=ttymxc1,115200n8 rootwait root=PARTUUID=\${btpart} net.ifnames=0 rootfstype=ext4

 loadfdt=load \${dtype} \${disk}:1 0x11000000 \${fdt_file}

--- a/rpi-tft.sh
+++ b/rpi-tft.sh
@@ -123,7 +123,7 @@ apt-get --yes --force-yes autoremove
 # image insecure and enable root login with a password.

 echo "Making the image insecure"
-sed -i -e 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config

 update-rc.d ssh enable

@@ -214,6 +214,7 @@ make modules_install INSTALL_MOD_PATH=${basedir}/root
 git clone --depth 1 https://github.com/adafruit/rpi-firmware.git rpi-firmware
 rm -rf rpi-firmware/extra rpi-firmware/modules rpi-firmware/firmware rpi-firmware/vc
 cp -rf rpi-firmware/* ${basedir}/bootp/
+rm -rf rpi-firmware/
 cp arch/arm/boot/zImage ${basedir}/bootp/kernel.img
 make mrproper
 cp ../rpi-ada-3.15.config .config
@@ -222,7 +223,7 @@ cd ${basedir}

 # Create cmdline.txt file
 cat << EOF > ${basedir}/bootp/cmdline.txt
-dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 elevator=deadline root=/dev/mmcblk0p2 rootfstype=ext4 rootwait fbcon=map:10 fbcon=font:VGA8x8
+dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 elevator=deadline root=/dev/mmcblk0p2 rootfstype=ext4 rootwait fbcon=map:10 fbcon=font:VGA8x8 net.ifnames=0
 EOF

 cat << EOF >> ${basedir}/root/etc/modules
--- a/rpi.sh
+++ b/rpi.sh
@@ -28,6 +28,9 @@ extras="iceweasel xfce4-terminal wpasupplicant"
 # kernel sauces take up space
 size=7000 # Size of image in megabytes

+# Git commit hash to check out for the kernel
+kernel_commit=20fe468
+
 packages="${arm} ${base} ${desktop} ${tools} ${services} ${extras}"
 architecture="armel"
 # If you have your own preferred mirrors, set them here.
@@ -123,7 +126,7 @@ apt-get --yes --force-yes autoremove
 # image insecure and enable root login with a password.

 echo "Making the image insecure"
-sed -i -e 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config

 update-rc.d ssh enable

@@ -196,33 +199,43 @@ EOF

 # Kernel section. If you want to use a custom kernel, or configuration, replace
 # them in this section.
-git clone --depth 1 https://github.com/raspberrypi/linux -b rpi-4.0.y ${basedir}/root/usr/src/kernel
+git clone --depth 1 https://github.com/raspberrypi/linux -b rpi-4.1.y ${basedir}/root/usr/src/kernel
 git clone --depth 1 https://github.com/raspberrypi/tools ${basedir}/tools

 cd ${basedir}/root/usr/src/kernel
-git rev-parse HEAD > ../kernel-at-commit
-patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/kali-wifi-injection-4.0.patch
+git checkout $kernel_commit
+echo $kernel_commit > ../kernel-at-commit
+patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/kali-wifi-injection-4.1.patch
 touch .scmversion
 export ARCH=arm
 export CROSS_COMPILE=${basedir}/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-
-cp ${basedir}/../kernel-configs/rpi-4.0.config .config
-cp ${basedir}/../kernel-configs/rpi-4.0.config ../rpi-4.0.config
+cp ${basedir}/../kernel-configs/rpi-4.1.config .config
+cp ${basedir}/../kernel-configs/rpi-4.1.config ../rpi-4.1.config
 make -j $(grep -c processor /proc/cpuinfo)
 make modules_install INSTALL_MOD_PATH=${basedir}/root
 git clone --depth 1 https://github.com/raspberrypi/firmware.git rpi-firmware
 cp -rf rpi-firmware/boot/* ${basedir}/bootp/
-cp arch/arm/boot/zImage ${basedir}/bootp/kernel.img
+rm -rf rpi-firmware
+# Because of device trees being used we need to go back to using mkknlimg :(
+#cp arch/arm/boot/zImage ${basedir}/bootp/kernel.img
+${basedir}/tools/mkimage/mkknlimg --dtok arch/arm/boot/zImage ${basedir}/bootp/kernel.img
 mkdir -p ${basedir}/bootp/overlays/
 cp arch/arm/boot/dts/bcm*.dtb ${basedir}/bootp/
 cp arch/arm/boot/dts/overlays/*overlay*.dtb ${basedir}/bootp/overlays/
+rm -rf ${basedir}/root/lib/firmware
+cd ${basedir}/root/lib
+git clone --depth 1 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
+rm -rf ${basedir}/root/lib/firmware/.git
+cd ${basedir}/root/usr/src/kernel
+make INSTALL_MOD_PATH=${basedir}/root firmware_install
 make mrproper
-cp ../rpi-4.0.config .config
+cp ../rpi-4.1.config .config
 make modules_prepare
 cd ${basedir}

 # Create cmdline.txt file
 cat << EOF > ${basedir}/bootp/cmdline.txt
-dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 elevator=deadline root=/dev/mmcblk0p2 rootfstype=ext4 rootwait
+dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 elevator=deadline root=/dev/mmcblk0p2 rootfstype=ext4 rootwait net.ifnames=0
 EOF

 # systemd doesn't seem to be generating the fstab properly for some people, so
@@ -236,11 +249,6 @@ proc /proc proc nodev,noexec,nosuid 0  0
 /dev/mmcblk0p1 /boot vfat noauto 0 0
 EOF

-rm -rf ${basedir}/root/lib/firmware
-cd ${basedir}/root/lib
-git clone --depth 1 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
-rm -rf ${basedir}/root/lib/firmware/.git
-
 # rpi-wiggle
 mkdir -p ${basedir}/root/scripts
 wget https://raw.github.com/dweeber/rpiwiggle/master/rpi-wiggle -O ${basedir}/root/scripts/rpi-wiggle.sh
--- a/rpi2.sh
+++ b/rpi2.sh
@@ -116,7 +116,7 @@ apt-get --yes --force-yes autoremove
 # image insecure and enable root login with a password.

 echo "Making the image insecure"
-sed -i -e 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
 update-rc.d ssh enable

 rm -f /usr/sbin/policy-rc.d
@@ -188,31 +188,39 @@ EOF

 # Kernel section. If you want to use a custom kernel, or configuration, replace
 # them in this section.
-git clone --depth 1 https://github.com/raspberrypi/linux -b rpi-3.18.y ${basedir}/root/usr/src/kernel
+git clone --depth 1 https://github.com/raspberrypi/linux -b rpi-4.1.y ${basedir}/root/usr/src/kernel
 cd ${basedir}/root/usr/src/kernel
 git rev-parse HEAD > ../kernel-at-commit
-patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/kali-wifi-injection-4.0.patch
+patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/kali-wifi-injection-4.1.patch
 touch .scmversion
 export ARCH=arm
 export CROSS_COMPILE=arm-linux-gnueabihf-
-cp ${basedir}/../kernel-configs/rpi2-3.18.config .config
-cp ${basedir}/../kernel-configs/rpi2-3.18.config ../rpi2-3.18.config
+cp ${basedir}/../kernel-configs/rpi2-4.1.config .config
+cp ${basedir}/../kernel-configs/rpi2-4.1.config ../rpi2-4.1.config
 make -j $(grep -c processor /proc/cpuinfo)
 make modules_install INSTALL_MOD_PATH=${basedir}/root
 git clone --depth 1 https://github.com/raspberrypi/firmware.git rpi-firmware
 cp -rf rpi-firmware/boot/* ${basedir}/bootp/
-cp arch/arm/boot/zImage ${basedir}/bootp/kernel7.img
+# ARGH.  Device tree support requires we run this *sigh*
+perl scripts/mkknlimg --dtok arch/arm/boot/zImage ${basedir}/bootp/kernel7.img
+#cp arch/arm/boot/zImage ${basedir}/bootp/kernel7.img
 cp arch/arm/boot/dts/bcm*.dtb ${basedir}/bootp/
 cp arch/arm/boot/dts/overlays/*overlay*.dtb ${basedir}/bootp/overlays/
+rm -rf ${basedir}/root/lib/firmware
+cd ${basedir}/root/lib
+git clone --depth 1 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
+rm -rf ${basedir}/root/lib/firmware/.git
+cd ${basedir}/root/usr/src/kernel
+make INSTALL_MOD_PATH=${basedir}/root firmware_install
 make mrproper
-cp ../rpi2-3.18.config .config
+cp ../rpi2-4.1.config .config
 make modules_prepare
 rm -rf rpi-firmware
 cd ${basedir}

 # Create cmdline.txt file
 cat << EOF > ${basedir}/bootp/cmdline.txt
-dwc_otg.fiq_fix_enable=2 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait rootflags=noload
+dwc_otg.fiq_fix_enable=2 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait rootflags=noload net.ifnames=0
 EOF

 # systemd doesn't seem to be generating the fstab properly for some people, so
@@ -226,10 +234,10 @@ proc /proc proc nodev,noexec,nosuid 0  0
 /dev/mmcblk0p1 /boot vfat noauto 0 0
 EOF

-rm -rf ${basedir}/root/lib/firmware
-cd ${basedir}/root/lib
-git clone --depth 1 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
-rm -rf ${basedir}/root/lib/firmware/.git
+# Firmware needed for rpi3 wifi/bt
+mkdir -p ${basedir}/root/lib/firmware/brcm/
+cp ${basedir}/../misc/rpi3/brcmfmac43430-sdio.txt ${basedir}/root/lib/firmware/brcm/
+cp ${basedir}/../misc/rpi3/brcmfmac43430-sdio.bin ${basedir}/root/lib/firmware/brcm/

 cd ${basedir}

--- a/trimslice.sh
+++ b/trimslice.sh
@@ -222,7 +222,7 @@ rm -rf ${basedir}/root/lib/firmware/.git
 cd ${basedir}

 echo << EOF > ${basedir}/bootp/boot.txt
-setenv bootargs root=/dev/mmcblk0p2 nohdparm rootwait console=ttyS0,115200n8 earlyprintk
+setenv bootargs root=/dev/mmcblk0p2 nohdparm rootwait console=ttyS0,115200n8 earlyprintk net.ifnames=0
 ext2load usb 0:1 4080000 zImage
 ext2load usb 0:1 4000000 tegra20-trimslice.dtb
 bootz 4080000 - 4000000
--- a/usbarmory.sh
+++ b/usbarmory.sh
@@ -124,7 +124,7 @@ apt-get --yes --force-yes autoremove
 # image insecure and enable root login with a password.

 echo "Making the image insecure"
-sed -i -e 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+sed -i -e 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config

 echo "Enabling sshd"
 update-rc.d ssh enable
--- a/utilite.sh
+++ b/utilite.sh
@@ -225,7 +225,7 @@ cd ${basedir}
 # Create a file to set up our u-boot environment
 cat << EOF > ${basedir}/bootp/boot.txt
 setenv mmcdev 2
-setenv bootargs 'quiet earlyprintk console=ttymxc3,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait'
+setenv bootargs 'quiet earlyprintk console=ttymxc3,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait net.ifnames=0'
 setenv loadaddr  0x10800000
 setenv fdtaddr   0x15000000
 setenv bootm_low 0x15000000