diff --git a/.github/workflows/build-reusable.yaml b/.github/workflows/build-reusable.yaml
index 2755945d86f..f3b683fe961 100644
--- a/.github/workflows/build-reusable.yaml
+++ b/.github/workflows/build-reusable.yaml
@@ -30,6 +30,10 @@ on:
         description: "Languages list"
         type: string
         default: '[""]'
+      report:
+        description: "Generate build report"
+        type: boolean
+        default: true
       sim:
         description: "Simulator"
         type: string
@@ -63,6 +67,7 @@ jobs:
           echo "Target list:    ${{ inputs.target }}"
           echo "Compiler list:  ${{ inputs.compiler }}"
           echo "C model list:   ${{ inputs.cmodel }}"
+          echo "Report:         ${{ inputs.report }}"
           echo "Languages list: ${{ inputs.languages }}"
           echo "Simulator:      ${{ inputs.sim }}"
 
@@ -111,6 +116,8 @@ jobs:
         sim: ${{ fromJSON(inputs.sim) }}
         cmodel: ${{ fromJSON(inputs.cmodel) }}
         languages: ${{ fromJSON(inputs.languages) }}
+        report: 
+          - ${{ inputs.report }}
 
         exclude:
           - mode: musl
@@ -167,6 +174,7 @@ jobs:
           matrix.os == 'ubuntu-24.04'
           && (matrix.mode == 'linux' || matrix.mode == 'newlib')
           && matrix.compiler == 'gcc'
+          && matrix.report == true
         run: |
           make report-${{ matrix.mode }} -j $(nproc)
 
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 3a31d34aecf..a44a7483f62 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -4,18 +4,26 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - master
+      - et     # change back to `master` after upstreaming
   pull_request:
     branches:
-      - master
+      - et     # change back to `master` after upstreaming
 
 jobs:
   build:
     uses: ./.github/workflows/build-reusable.yaml
     with:
       artifact-name: build
+      target: '["rv64imfc-lp64f"]'
+      os: '["ubuntu-24.04"]'
+      mode: '["newlib"]'
+      cmodel: '["medany"]'
+      languages: '["c,c++"]'
+      report: false
 
   test-sim:
+    # disable until upstreamed
+    if: ${{ false }}
     uses: ./.github/workflows/build-reusable.yaml
     with:
       artifact-name: sim
diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml
index 28e803d670b..8b3c652c031 100644
--- a/.github/workflows/nightly-release.yaml
+++ b/.github/workflows/nightly-release.yaml
@@ -55,6 +55,13 @@ jobs:
     needs: [activity-check]
     if: needs.activity-check.outputs.stale != 'true'
     uses: ./.github/workflows/build-reusable.yaml
+    with:
+      target: '["rv64imfc-lp64f"]'
+      os: '["ubuntu-24.04"]'
+      mode: '["newlib"]'
+      cmodel: '["medany"]'
+      languages: '["c,c++"]'
+      report: false
 
   create-release:
     needs: [build]
diff --git a/.gitmodules b/.gitmodules
index 65f0232bb8e..4e536156300 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,11 +1,6 @@
 # Some of the external git repos are not upstream servers but upstream clones to
 # avoid "Server does not allow request for unadvertised object" errors (see
 # #1654).
-[submodule "binutils"]
-	path = binutils
-	url = https://github.com/bminor/binutils-gdb.git
-	branch = binutils-2_45-branch
-	shallow = true
 [submodule "gcc"]
 	path = gcc
 	url = https://github.com/gcc-mirror/gcc.git
@@ -25,11 +20,6 @@
 	url = https://github.com/bminor/newlib.git
 	branch = master
 	shallow = true
-[submodule "gdb"]
-	path = gdb
-	url = https://github.com/bminor/binutils-gdb.git
-	branch = gdb-16-branch
-	shallow = true
 [submodule "qemu"]
 	path = qemu
 	url = https://gitlab.com/qemu-project/qemu.git
@@ -58,3 +48,11 @@
 	path = uclibc-ng
 	url = https://github.com/wbx-github/uclibc-ng.git
 	shallow = true
+[submodule "binutils"]
+	path = binutils
+	url = https://github.com/aifoundry-org/binutils-gdb.git
+	branch = et
+[submodule "gdb"]
+	path = gdb
+	url = https://github.com/aifoundry-org/binutils-gdb.git
+	branch = et
diff --git a/aifoundry/README.md b/aifoundry/README.md
new file mode 100644
index 00000000000..6c6f34e23dd
--- /dev/null
+++ b/aifoundry/README.md
@@ -0,0 +1,14 @@
+# RISCV Toolchain for ETSOC1
+
+This repository contains the toolchain for the ETSOC1 chip.
+
+To build:
+
+    $ ./configure --prefix=/opt/et --with-arch=rv64imfc --with-abi=lp64f \
+                  --with-languages=c,c++ --with-cmodel=medany
+    $ make -j $(nproc)
+
+As per main README, Ubuntu dependencies are as following:
+
+    $ sudo apt-get install autoconf automake autotools-dev curl python3 python3-pip python3-tomli libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat-dev ninja-build git cmake libglib2.0-dev libslirp-dev
+
diff --git a/binutils b/binutils
index 2bc7af1ff77..6d010488990 160000
--- a/binutils
+++ b/binutils
@@ -1 +1 @@
-Subproject commit 2bc7af1ff7732451b6a7b09462a815c3284f9613
+Subproject commit 6d0104889902f7ea5110c98941fec78c5b6285b9
diff --git a/gdb b/gdb
index 800169229d1..6d010488990 160000
--- a/gdb
+++ b/gdb
@@ -1 +1 @@
-Subproject commit 800169229d1c69a6d9ad4a6f7b7481aca75eeefb
+Subproject commit 6d0104889902f7ea5110c98941fec78c5b6285b9