From 293e5ef633d0baafa49e25a5cc2927d469350faf Mon Sep 17 00:00:00 2001
From: Jeff S <jeffreesun@protonmail.com>
Date: Sat, 4 Dec 2021 21:37:24 +0000
Subject: [PATCH] Build the kendryte toolchain from source

---
 Dockerfile     | 29 ++++++++++++++++++++++++-----
 Vagrantfile    |  1 +
 firmware/Kboot |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b61246298..8d64ffe77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,21 +32,40 @@ RUN apt-get update -y && \
         build-essential \
         libtool \
         autoconf \
+        automake \
+        autotools-dev \
+        curl \
+        libmpc-dev \
+        libmpfr-dev \
+        libgmp-dev \
+        gawk \
+        bison \
+        flex \
+        texinfo \
+        gperf \
+        libtool \
+        patchutils \
+        bc \
+        zlib1g-dev \
+        libexpat-dev \
         libisl-dev \
         python3 \
         python3-pip \
         python3-setuptools
 
+RUN mkdir -p /opt && \
+    git clone --recursive https://github.com/kendryte/kendryte-gnu-toolchain && \
+    cd kendryte-gnu-toolchain && \
+    git checkout fbf55383711b68c00ecf67e23959822180010398 && \
+    export PATH=$PATH:/opt/kendryte-toolchain/bin && \
+    ./configure --prefix=/opt/kendryte-toolchain --with-cmodel=medany --with-arch=rv64imafc --with-abi=lp64f --enable-threads=posix --enable-libatomic && \
+    make -j8
+
 RUN wget https://github.com/Kitware/CMake/releases/download/v3.21.0/cmake-3.21.0.tar.gz && \
     echo "4a42d56449a51f4d3809ab4d3b61fd4a96a469e56266e896ce1009b5768bd2ab  cmake-3.21.0.tar.gz" | sha256sum -c && \
     tar -xzvf cmake-3.21.0.tar.gz && \
     cd cmake-3.21.0 && ./bootstrap && make && make install
 
-RUN mkdir -p /opt && \
-    wget https://github.com/kendryte/kendryte-gnu-toolchain/releases/download/v8.2.0-20190213/kendryte-toolchain-ubuntu-amd64-8.2.0-20190213.tar.gz && \
-    echo "aa2fcc76ff61261b3667a422d4f67dec19c4547474bff4ebadaa1258b87985da  kendryte-toolchain-ubuntu-amd64-8.2.0-20190213.tar.gz" | sha256sum -c && \
-    tar -xzvf kendryte-toolchain-ubuntu-amd64-8.2.0-20190213.tar.gz -C /opt
-
 RUN pip3 install astor
 
 FROM build-base AS build-software
diff --git a/Vagrantfile b/Vagrantfile
index 7d639ee0c..681e79903 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -28,6 +28,7 @@ Vagrant.configure("2") do |config|
   config.vm.provision :docker
 
   config.vm.provider "virtualbox" do |vb|
+    vb.memory = 4096
     vb.customize ['modifyvm', :id, '--usb', 'on']
     vb.customize ['usbfilter', 'add', '0', '--target', :id, '--name', 'FT232', '--vendorid', '0403', '--productid', '6001']
   end
diff --git a/firmware/Kboot b/firmware/Kboot
index e3892d6b5..78348888e 160000
--- a/firmware/Kboot
+++ b/firmware/Kboot
@@ -1 +1 @@
-Subproject commit e3892d6b50425721c9713b077d2d5b2f76820a2a
+Subproject commit 78348888ef0275312efc4e68b51755a8167ac11f