diff --git a/config/buildroot_nano.patch b/config/buildroot_nano.patch
index a48b8542dd39f49b5caf4bd9c8b6a9f3c8824a94..2c879248d137e6cb398cd446fbcb937ae7bc68a4 100644
--- a/config/buildroot_nano.patch
+++ b/config/buildroot_nano.patch
@@ -1,11 +1,18 @@
board/friendlyarm/nanopi-neo-plus2/boot.cmd | 6 ++
- board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 4 +-
+ board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 5 +-
.../nanopi-neo-plus2/linux-extras.config | 11 +++
.../nanopi-neo-plus2/nanopi-neo-plus2.dts | 7 ++
+<<<<<<< HEAD
configs/friendlyarm_nanopi_neo_plus2_defconfig | 97 +++++++++++++---------
package/dropbear/S50dropbear | 2 +-
package/openssh/S50sshd | 3 +
7 files changed, 87 insertions(+), 43 deletions(-)
+=======
+ configs/friendlyarm_nanopi_neo_plus2_defconfig | 94 +++++++++++++---------
+ package/dropbear/S50dropbear | 2 +-
+ package/openssh/S50sshd | 3 +
+ 7 files changed, 85 insertions(+), 43 deletions(-)
+>>>>>>> aad1196baf300c08bae4d467324a8e857a207196
diff --git a/board/friendlyarm/nanopi-neo-plus2/boot.cmd b/board/friendlyarm/nanopi-neo-plus2/boot.cmd
new file mode 100644
@@ -20,7 +27,7 @@ index 0000000000..ec83aa9ef3
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
-index fb871abd43..bf6f68872d 100644
+index fb871abd43..1f87767431 100644
--- a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
+++ b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
@@ -2,8 +2,8 @@ image boot.vfat {
@@ -34,6 +41,13 @@ index fb871abd43..bf6f68872d 100644
}
}
size = 64M
+@@ -35,5 +35,6 @@ image sdcard.img {
+ partition rootfs {
+ partition-type = 0x83
+ image = "rootfs.ext4"
++ size = 2G
+ }
+ }
diff --git a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config b/board/friendlyarm/nanopi-neo-plus2/linux-extras.config
index 52b4b4b29e..2ea8b06bc2 100644
--- a/board/friendlyarm/nanopi-neo-plus2/linux-extras.config
diff --git a/install-fedora-environment.sh b/install-fedora-environment.sh
index 0dda7dc4d10fb5a054f21d57330a76360ca2b331..6b41e3c93df5df435980bf678f670bd213e57989 100755
--- a/install-fedora-environment.sh
+++ b/install-fedora-environment.sh
@@ -33,14 +33,14 @@ sudo dnf install -y git-gui meld
sudo dnf install -y git-credential-libsecret
git config --global credential.helper /usr/libexec/git-core/git-credential-libsecret
-#install eclipse IDE
-if [ ! -d "/opt/eclipse" ]; then
-wget http://mirrors.uniri.hr/eclipse//technology/epp/downloads/release/photon/R/eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
-sudo tar xf eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz -C /opt
-sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
-rm eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
-fi
-cp ${SCRIPTDIR}/config/eclipse.desktop ~/.local/share/applications/
+# #install eclipse IDE
+# if [ ! -d "/opt/eclipse" ]; then
+# wget http://mirrors.uniri.hr/eclipse//technology/epp/downloads/release/photon/R/eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
+# sudo tar xf eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz -C /opt
+# sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
+# rm eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
+# fi
+# cp ${SCRIPTDIR}/config/eclipse.desktop ~/.local/share/applications/
#install tftpd server
sudo dnf install -y tftp-server xinetd
@@ -62,13 +62,13 @@ sudo firewall-cmd --permanent --zone FedoraWorkstation --add-service tftp
sudo firewall-cmd --permanent --zone FedoraWorkstation --add-service rpc-bind
sudo firewall-cmd --reload
-echo ""
-echo "How to fix Flickering in Fedora on Virtualbox"
-echo "according to https://www.serverlab.ca/tutorials/linux/administration-linux/how-to-fix-flickering-in-fedora-on-virtualbox/"
-echo ""
-echo "edit file : /etc/gdm/custom.conf"
-echo "under '[DAEMON]':"
-echo " - uncomment variable 'WaylandEnable' and ensure it is set to 'false'"
-echo " - add line 'DefaultSession=gnome=xorg.desktop'"
-echo "save the file and restart"
-echo ""
+# echo ""
+# echo "How to fix Flickering in Fedora on Virtualbox"
+# echo "according to https://www.serverlab.ca/tutorials/linux/administration-linux/how-to-fix-flickering-in-fedora-on-virtualbox/"
+# echo ""
+# echo "edit file : /etc/gdm/custom.conf"
+# echo "under '[DAEMON]':"
+# echo " - uncomment variable 'WaylandEnable' and ensure it is set to 'false'"
+# echo " - add line 'DefaultSession=gnome=xorg.desktop'"
+# echo "save the file and restart"
+# echo ""
diff --git a/install-ubuntu-environment.sh b/install-ubuntu-environment.sh
index 20163a2c0d1ae4a837eec7bb373d3ca8541d8ca7..c64e55fcef2f7aa94e3c05956dedf8858f8b4592 100755
--- a/install-ubuntu-environment.sh
+++ b/install-ubuntu-environment.sh
@@ -29,17 +29,17 @@ sudo apt install -y libsecret-1-0 libsecret-1-dev
sudo make -C /usr/share/doc/git/contrib/credential/libsecret
git config --global credential.helper /usr/share/doc/git/contrib/credential/libsecret/git-credential-libsecret
-#install java environment
-sudo apt install -y default-jre
-
-#install eclipse IDE
-if [ ! -d "/opt/eclipse" ]; then
-wget http://mirrors.uniri.hr/eclipse//technology/epp/downloads/release/photon/R/eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
-sudo tar xf eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz -C /opt
-sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
-rm eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
-fi
-cp ${SCRIPTDIR}/config/eclipse.desktop ~/.local/share/applications/
+# #install java environment
+# sudo apt install -y default-jre
+
+# #install eclipse IDE
+# if [ ! -d "/opt/eclipse" ]; then
+# wget http://mirrors.uniri.hr/eclipse//technology/epp/downloads/release/photon/R/eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
+# sudo tar xf eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz -C /opt
+# sudo ln -s /opt/eclipse/eclipse /usr/bin/eclipse
+# rm eclipse-cpp-photon-R-linux-gtk-x86_64.tar.gz
+# fi
+# cp ${SCRIPTDIR}/config/eclipse.desktop ~/.local/share/applications/
#install tftpd server
sudo apt install -y xinetd tftpd tftp