diff --git a/builds.toml b/builds.toml
index 8e0a131..b64682b 100644
--- a/builds.toml
+++ b/builds.toml
@@ -2,6 +2,8 @@
 
 # Builds for GitHub Actions
 builds = [
+    "trixie-am62lxx-evm",
+    "trixie-rt-am62lxx-evm",
     "trixie-am62pxx-evm",
     "trixie-rt-am62pxx-evm",
     "trixie-am62xx-evm",
@@ -25,6 +27,16 @@ builds = [
 ]
 
 # List of all valid trixie builds
+[trixie-am62lxx-evm]
+    machine = "am62lxx-evm"
+    distro_codename = "trixie"
+    rt_linux = "false"
+
+[trixie-rt-am62lxx-evm]
+    machine = "am62lxx-evm"
+    distro_codename = "trixie"
+    rt_linux = "true"
+
 [trixie-am62pxx-evm]
     machine = "am62pxx-evm"
     distro_codename = "trixie"
diff --git a/configs/bdebstrap_configs/trixie/trixie-am62lxx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62lxx-evm.yaml
new file mode 100644
index 0000000..a5deaef
--- /dev/null
+++ b/configs/bdebstrap_configs/trixie/trixie-am62lxx-evm.yaml
@@ -0,0 +1,109 @@
+---
+mmdebstrap:
+  architectures:
+    - arm64
+  mode: auto
+  keyrings:
+    - /usr/share/keyrings/debian-archive-keyring.gpg
+  suite: trixie
+  variant: standard
+  hostname: am62lxx-evm
+  components:
+    - main
+    - contrib
+    - non-free-firmware
+  packages:
+    - build-essential
+    - gpg
+    - curl
+    - firmware-ti-connectivity
+    - init
+    - iproute2
+    - less
+    - libdrm-dev
+    - libpam-systemd
+    - locales
+    - net-tools
+    - openssh-server
+    - sudo
+    - vim
+    - k3conf
+    - alsa-utils
+    - libasound2-plugins
+    - gstreamer1.0-tools
+    - gstreamer1.0-plugins-base
+    - gstreamer1.0-plugins-good
+    - gstreamer1.0-plugins-bad
+    - linux-image-6.12.13-k3
+    - linux-headers-6.12.13-k3
+    - linux-libc-dev
+    - libti-rpmsg-char
+    - libti-rpmsg-char-dev
+    - libpru-pssp-dev
+    - pru-pssp
+    - parted
+    - e2fsprogs
+    - wpasupplicant
+    - cc33xx-target-scripts
+    - cc33xx-fw
+    - cc33calibrator
+    - cc33conf
+    - udhcpc
+    - weston
+    - seatd
+    - ti-lvgl-demo
+  mirrors:
+    - http://deb.debian.org/debian
+  setup-hooks:
+      # Setup TI Debian Package Repository
+    - 'mkdir -p $1/etc/apt/sources.list.d/'
+    - 'wget https://raw.githubusercontent.com/TexasInstruments/ti-debpkgs/main/ti-debpkgs.sources -P $1/etc/apt/sources.list.d/'
+    - 'sed -i "s/bookworm/trixie/g" $1/etc/apt/sources.list.d/ti-debpkgs.sources'
+      # Setup Apt repository preferences
+    - 'mkdir -p $1/etc/apt/preferences.d/'
+    - 'printf "Package: *\nPin: origin TexasInstruments.github.io\nPin-Priority: 1001" >> $1/etc/apt/preferences.d/ti-debpkgs'
+      # Setup Kernel post-install scripts
+    - 'mkdir -p $1/etc/kernel/postinst.d/'
+    - 'echo "PWD = $PWD"'
+    - 'upload target/kernel/postinst.d/cp-kernel-and-overlays /etc/kernel/postinst.d/cp-kernel-and-overlays'
+    - 'chmod a+x $1/etc/kernel/postinst.d/cp-kernel-and-overlays'
+  essential-hooks:
+    # FIXME: Find a better workaround instead of sleep
+    - 'sleep 10' # workaround for /proc resource busy unable to umount issue
+  customize-hooks:
+      # Remove passwd for root user
+    - 'chroot "$1" passwd --delete root'
+      # Fix apt install mandb permission issue
+    - 'chroot "$1" chown -R man: /var/cache/man/'
+    - 'chroot "$1" chmod -R 755 /var/cache/man/'
+      # update packages to avoid mandatory update after first boot
+    - 'chroot "$1" apt-get update'
+      # systemd-networkd Network Files
+    - 'chroot "$1" mkdir -p /etc/systemd/network/'
+    - 'upload target/systemd-networkd/10-eth.network /etc/systemd/network/10-eth.network'
+    - 'upload target/systemd-networkd/15-eth.network /etc/systemd/network/15-eth.network'
+    - 'upload target/systemd-networkd/30-wlan.network /etc/systemd/network/30-wlan.network'
+    - 'upload target/systemd-networkd/60-usb.network /etc/systemd/network/60-usb.network'
+      # Enable seatd service
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
+      # Setup .bashrc for clean command-line experience
+    - 'chroot "$1" cp /etc/skel/.bashrc ~/.bashrc'
+      # Weston Service and Config Files
+    - 'chroot "$1" mkdir -p /etc/systemd/system/'
+    - 'upload target/weston/weston.service /etc/systemd/system/weston.service'
+    - 'upload target/weston/weston.socket /etc/systemd/system/weston.socket'
+    - 'chroot "$1" mkdir -p /etc/default/'
+    - 'upload target/weston/weston /etc/default/weston'
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
+    - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+      # Enable ssh to root user without password
+    - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
+    - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
+      # Resize Rootfs Service
+    - 'chroot "$1" mkdir -p /usr/bin'
+    - 'upload target/resize_rootfs/resize_rootfs.sh /usr/bin/resize_rootfs.sh'
+    - 'chroot "$1" chmod a+x /usr/bin/resize_rootfs.sh'
+    - 'chroot "$1" mkdir -p /etc/systemd/system/'
+    - 'upload target/resize_rootfs/resize_rootfs.service /etc/systemd/system/resize_rootfs.service'
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" resize_rootfs'
+
diff --git a/configs/bdebstrap_configs/trixie/trixie-am62pxx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62pxx-evm.yaml
index a3eaa84..40af866 100644
--- a/configs/bdebstrap_configs/trixie/trixie-am62pxx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-am62pxx-evm.yaml
@@ -23,7 +23,6 @@ mmdebstrap:
     - libdrm-dev
     - libpam-systemd
     - locales
-    - neofetch
     - net-tools
     - openssh-server
     - sudo
@@ -37,8 +36,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.58-k3
-    - linux-headers-6.6.58-k3
+    - linux-image-6.12.13-k3
+    - linux-headers-6.12.13-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62p-dkms
diff --git a/configs/bdebstrap_configs/trixie/trixie-am62xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62xx-evm.yaml
index d745372..89cd941 100644
--- a/configs/bdebstrap_configs/trixie/trixie-am62xx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-am62xx-evm.yaml
@@ -23,7 +23,6 @@ mmdebstrap:
     - libdrm-dev
     - libpam-systemd
     - locales
-    - neofetch
     - net-tools
     - openssh-server
     - sudo
@@ -37,8 +36,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.58-k3
-    - linux-headers-6.6.58-k3
+    - linux-image-6.12.13-k3
+    - linux-headers-6.12.13-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
diff --git a/configs/bdebstrap_configs/trixie/trixie-am62xx-lp-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62xx-lp-evm.yaml
index 9bd72c3..cec85c8 100644
--- a/configs/bdebstrap_configs/trixie/trixie-am62xx-lp-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-am62xx-lp-evm.yaml
@@ -23,7 +23,6 @@ mmdebstrap:
     - libdrm-dev
     - libpam-systemd
     - locales
-    - neofetch
     - network-manager
     - net-tools
     - openssh-server
@@ -38,8 +37,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.58-k3
-    - linux-headers-6.6.58-k3
+    - linux-image-6.12.13-k3
+    - linux-headers-6.12.13-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
diff --git a/configs/bdebstrap_configs/trixie/trixie-am62xxsip-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am62xxsip-evm.yaml
index 110943b..7856ae8 100644
--- a/configs/bdebstrap_configs/trixie/trixie-am62xxsip-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-am62xxsip-evm.yaml
@@ -23,7 +23,6 @@ mmdebstrap:
     - libdrm-dev
     - libpam-systemd
     - locales
-    - neofetch
     - network-manager
     - net-tools
     - openssh-server
@@ -38,8 +37,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.58-k3
-    - linux-headers-6.6.58-k3
+    - linux-image-6.12.13-k3
+    - linux-headers-6.12.13-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
diff --git a/configs/bdebstrap_configs/trixie/trixie-am64xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-am64xx-evm.yaml
index c3a72cb..01f099d 100644
--- a/configs/bdebstrap_configs/trixie/trixie-am64xx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-am64xx-evm.yaml
@@ -23,7 +23,6 @@ mmdebstrap:
     - libdrm-dev
     - libpam-systemd
     - locales
-    - neofetch
     - network-manager
     - net-tools
     - openssh-server
@@ -31,8 +30,8 @@ mmdebstrap:
     - vim
     - k3conf
     - weston
-    - linux-image-6.6.58-k3
-    - linux-headers-6.6.58-k3
+    - linux-image-6.12.13-k3
+    - linux-headers-6.12.13-k3
     - linux-libc-dev
     - cryptodev-linux-dkms
     - firmware-ti-ipc-am64
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62lxx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62lxx-evm.yaml
new file mode 100644
index 0000000..cb40df9
--- /dev/null
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am62lxx-evm.yaml
@@ -0,0 +1,109 @@
+---
+mmdebstrap:
+  architectures:
+    - arm64
+  mode: auto
+  keyrings:
+    - /usr/share/keyrings/debian-archive-keyring.gpg
+  suite: trixie
+  variant: standard
+  hostname: am62lxx-evm
+  components:
+    - main
+    - contrib
+    - non-free-firmware
+  packages:
+    - build-essential
+    - gpg
+    - curl
+    - firmware-ti-connectivity
+    - init
+    - iproute2
+    - less
+    - libdrm-dev
+    - libpam-systemd
+    - locales
+    - net-tools
+    - openssh-server
+    - sudo
+    - vim
+    - k3conf
+    - alsa-utils
+    - libasound2-plugins
+    - gstreamer1.0-tools
+    - gstreamer1.0-plugins-base
+    - gstreamer1.0-plugins-good
+    - gstreamer1.0-plugins-bad
+    - linux-image-6.12.13-k3-rt
+    - linux-headers-6.12.13-k3-rt
+    - linux-libc-dev
+    - libti-rpmsg-char
+    - libti-rpmsg-char-dev
+    - libpru-pssp-dev
+    - pru-pssp
+    - parted
+    - e2fsprogs
+    - wpasupplicant
+    - cc33xx-target-scripts
+    - cc33xx-fw
+    - cc33calibrator
+    - cc33conf
+    - udhcpc
+    - weston
+    - seatd
+    - ti-lvgl-demo
+  mirrors:
+    - http://deb.debian.org/debian
+  setup-hooks:
+      # Setup TI Debian Package Repository
+    - 'mkdir -p $1/etc/apt/sources.list.d/'
+    - 'wget https://raw.githubusercontent.com/TexasInstruments/ti-debpkgs/main/ti-debpkgs.sources -P $1/etc/apt/sources.list.d/'
+    - 'sed -i "s/bookworm/trixie/g" $1/etc/apt/sources.list.d/ti-debpkgs.sources'
+      # Setup Apt repository preferences
+    - 'mkdir -p $1/etc/apt/preferences.d/'
+    - 'printf "Package: *\nPin: origin TexasInstruments.github.io\nPin-Priority: 1001" >> $1/etc/apt/preferences.d/ti-debpkgs'
+      # Setup Kernel post-install scripts
+    - 'mkdir -p $1/etc/kernel/postinst.d/'
+    - 'echo "PWD = $PWD"'
+    - 'upload target/kernel/postinst.d/cp-kernel-and-overlays /etc/kernel/postinst.d/cp-kernel-and-overlays'
+    - 'chmod a+x $1/etc/kernel/postinst.d/cp-kernel-and-overlays'
+  essential-hooks:
+    # FIXME: Find a better workaround instead of sleep
+    - 'sleep 10' # workaround for /proc resource busy unable to umount issue
+  customize-hooks:
+      # Remove passwd for root user
+    - 'chroot "$1" passwd --delete root'
+      # Fix apt install mandb permission issue
+    - 'chroot "$1" chown -R man: /var/cache/man/'
+    - 'chroot "$1" chmod -R 755 /var/cache/man/'
+      # update packages to avoid mandatory update after first boot
+    - 'chroot "$1" apt-get update'
+      # Setup .bashrc for clean command-line experience
+    - 'chroot "$1" cp /etc/skel/.bashrc ~/.bashrc'
+      # Weston Service and Config Files
+    - 'chroot "$1" mkdir -p /etc/systemd/system/'
+    - 'upload target/weston/weston.service /etc/systemd/system/weston.service'
+    - 'upload target/weston/weston.socket /etc/systemd/system/weston.socket'
+    - 'chroot "$1" mkdir -p /etc/default/'
+    - 'upload target/weston/weston /etc/default/weston'
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
+    - 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
+      # systemd-networkd Network Files
+    - 'chroot "$1" mkdir -p /etc/systemd/network/'
+    - 'upload target/systemd-networkd/10-eth.network /etc/systemd/network/10-eth.network'
+    - 'upload target/systemd-networkd/15-eth.network /etc/systemd/network/15-eth.network'
+    - 'upload target/systemd-networkd/30-wlan.network /etc/systemd/network/30-wlan.network'
+    - 'upload target/systemd-networkd/60-usb.network /etc/systemd/network/60-usb.network'
+      # Enable seatd service
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" seatd'
+      # Enable ssh to root user without password
+    - 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
+    - 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
+      # Resize Rootfs Service
+    - 'chroot "$1" mkdir -p /usr/bin'
+    - 'upload target/resize_rootfs/resize_rootfs.sh /usr/bin/resize_rootfs.sh'
+    - 'chroot "$1" chmod a+x /usr/bin/resize_rootfs.sh'
+    - 'chroot "$1" mkdir -p /etc/systemd/system/'
+    - 'upload target/resize_rootfs/resize_rootfs.service /etc/systemd/system/resize_rootfs.service'
+    - '$BDEBSTRAP_HOOKS/enable-units "$1" resize_rootfs'
+
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62pxx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62pxx-evm.yaml
index eba2c19..ee01390 100644
--- a/configs/bdebstrap_configs/trixie/trixie-rt-am62pxx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am62pxx-evm.yaml
@@ -23,7 +23,6 @@ mmdebstrap:
     - libdrm-dev
     - libpam-systemd
     - locales
-    - neofetch
     - net-tools
     - openssh-server
     - sudo
@@ -37,8 +36,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.58-k3-rt
-    - linux-headers-6.6.58-k3-rt
+    - linux-image-6.12.13-k3-rt
+    - linux-headers-6.12.13-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62p-dkms
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-evm.yaml
index 76d421f..9010bae 100644
--- a/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-evm.yaml
@@ -23,7 +23,6 @@ mmdebstrap:
     - libdrm-dev
     - libpam-systemd
     - locales
-    - neofetch
     - net-tools
     - openssh-server
     - sudo
@@ -37,8 +36,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.58-k3-rt
-    - linux-headers-6.6.58-k3-rt
+    - linux-image-6.12.13-k3-rt
+    - linux-headers-6.12.13-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-lp-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-lp-evm.yaml
index dc1c418..aa783c4 100644
--- a/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-lp-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am62xx-lp-evm.yaml
@@ -23,7 +23,6 @@ mmdebstrap:
     - libdrm-dev
     - libpam-systemd
     - locales
-    - neofetch
     - network-manager
     - net-tools
     - openssh-server
@@ -38,8 +37,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.58-k3-rt
-    - linux-headers-6.6.58-k3-rt
+    - linux-image-6.12.13-k3-rt
+    - linux-headers-6.12.13-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am62xxsip-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am62xxsip-evm.yaml
index bff5e9c..28403df 100644
--- a/configs/bdebstrap_configs/trixie/trixie-rt-am62xxsip-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am62xxsip-evm.yaml
@@ -23,7 +23,6 @@ mmdebstrap:
     - libdrm-dev
     - libpam-systemd
     - locales
-    - neofetch
     - network-manager
     - net-tools
     - openssh-server
@@ -38,8 +37,8 @@ mmdebstrap:
     - gstreamer1.0-plugins-good
     - gstreamer1.0-plugins-bad
     - i2c-tools
-    - linux-image-6.6.58-k3-rt
-    - linux-headers-6.6.58-k3-rt
+    - linux-image-6.12.13-k3-rt
+    - linux-headers-6.12.13-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - ti-img-rogue-driver-am62-dkms
diff --git a/configs/bdebstrap_configs/trixie/trixie-rt-am64xx-evm.yaml b/configs/bdebstrap_configs/trixie/trixie-rt-am64xx-evm.yaml
index eba10b1..e6294ff 100644
--- a/configs/bdebstrap_configs/trixie/trixie-rt-am64xx-evm.yaml
+++ b/configs/bdebstrap_configs/trixie/trixie-rt-am64xx-evm.yaml
@@ -23,7 +23,6 @@ mmdebstrap:
     - libdrm-dev
     - libpam-systemd
     - locales
-    - neofetch
     - network-manager
     - net-tools
     - openssh-server
@@ -31,8 +30,8 @@ mmdebstrap:
     - vim
     - k3conf
     - weston
-    - linux-image-6.6.58-k3-rt
-    - linux-headers-6.6.58-k3-rt
+    - linux-image-6.12.13-k3-rt
+    - linux-headers-6.12.13-k3-rt
     - linux-libc-dev
     - cryptodev-linux-dkms
     - firmware-ti-ipc-am64
diff --git a/configs/bsp_sources.toml b/configs/bsp_sources.toml
index 988f2f1..22d588d 100644
--- a/configs/bsp_sources.toml
+++ b/configs/bsp_sources.toml
@@ -1,16 +1,16 @@
 # BSP selection based on variant of filesystem
 [trixie]
-    bsp_version = "10.01.10.04"
+    bsp_version = "11.00.05.02"
 
 [bookworm]
     bsp_version = "09.02.00.010"
 
 # BSP Configurations
-[10.01.10.04]
-    atf_srcrev = "58b25570c9ef91753b14c2103f45f4be9dddb696"
-    optee_srcrev = "8f645256efc0dc66bd5c118778b0b50c44469ae1"
-    uboot_srcrev = "10.01.10"
-    linux_fw_srcrev = "10.01.10"
+[11.00.05.02]
+    atf_srcrev = "dd46885ec58f9394b37f0c3d957e79838999b79d"
+    optee_srcrev = "ef1ebdc23034a804a72da2207f1a825ce96a1464"
+    uboot_srcrev = "11.00.05"
+    linux_fw_srcrev = "11.00.05"
 
 [09.02.00.010]
     atf_srcrev = "00f1ec6b8740ccd403e641131e294aabacf2a48b"
diff --git a/configs/machines/10.01.10.04.toml b/configs/machines/11.00.05.02.toml
similarity index 70%
rename from configs/machines/10.01.10.04.toml
rename to configs/machines/11.00.05.02.toml
index e744e58..f680487 100644
--- a/configs/machines/10.01.10.04.toml
+++ b/configs/machines/11.00.05.02.toml
@@ -1,18 +1,27 @@
 # This file describes various machine specific settings needed for the build
 
+[am62lxx-evm]
+    # u-boot config
+    atf_target_board = "am62l"
+    atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
+    optee_platform = "k3-am62lx"
+    optee_make_args = "CFG_TEE_CORE_LOG_LEVEL=1"
+    uboot_r5_defconfig = ""
+    uboot_a53_defconfig = "am62lx_evm_defconfig"
+
 [am62pxx-evm]
     # u-boot config
     atf_target_board = "lite"
-    atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
+    atf_make_args="K3_PM_SYSTEM_SUSPEND=1 SPD=opteed"
     optee_platform = "k3-am62px"
-    optee_make_args = "CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1"
+    optee_make_args = "CFG_TEE_CORE_LOG_LEVEL=1"
     uboot_r5_defconfig = "am62px_evm_r5_defconfig"
     uboot_a53_defconfig = "am62px_evm_a53_defconfig"
 
 [am62xx-evm]
     # u-boot config
     atf_target_board = "lite"
-    atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
+    atf_make_args="K3_PM_SYSTEM_SUSPEND=1 SPD=opteed"
     optee_platform = "k3-am62x"
     optee_make_args = "CFG_TEE_CORE_LOG_LEVEL=1"
     uboot_r5_defconfig = "am62x_evm_r5_defconfig"
@@ -21,7 +30,7 @@
 [am62xx-lp-evm]
     # u-boot config
     atf_target_board = "lite"
-    atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
+    atf_make_args="K3_PM_SYSTEM_SUSPEND=1 SPD=opteed"
     optee_platform = "k3-am62x"
     optee_make_args = "CFG_TEE_CORE_LOG_LEVEL=1"
     uboot_r5_defconfig = "am62x_lpsk_r5_defconfig"
@@ -30,7 +39,7 @@
 [am62xxsip-evm]
     # u-boot config
     atf_target_board = "lite"
-    atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
+    atf_make_args="K3_PM_SYSTEM_SUSPEND=1 SPD=opteed"
     optee_platform = "k3-am62x"
     optee_make_args = "CFG_TEE_CORE_LOG_LEVEL=1"
     uboot_r5_defconfig = "am62xsip_evm_r5_defconfig"
@@ -39,7 +48,7 @@
 [am64xx-evm]
     # u-boot config
     atf_target_board = "lite"
-    atf_make_args="K3_PM_SYSTEM_SUSPEND=1"
+    atf_make_args="K3_PM_SYSTEM_SUSPEND=1 SPD=opteed"
     optee_platform = "k3-am64x"
     optee_make_args = "."
     uboot_r5_defconfig = "am64x_evm_r5_defconfig"
diff --git a/scripts/build_bsp.sh b/scripts/build_bsp.sh
index cd5dbbf..a85abe5 100755
--- a/scripts/build_bsp.sh
+++ b/scripts/build_bsp.sh
@@ -25,16 +25,16 @@ bsp_version=$3
         log ">> atf: not found. cloning .."
         atf_srcrev=($(read_bsp_config ${bsp_version} atf_srcrev))
 
-        git clone https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git &>>"${LOG_FILE}"
+        git clone https://github.com/TexasInstruments/arm-trusted-firmware.git &>>"${LOG_FILE}"
 
-        cd trusted-firmware-a
+        cd arm-trusted-firmware
         git checkout ${atf_srcrev} &>>"${LOG_FILE}"
         cd ..
         log ">> atf: cloned"
     else
         log ">> atf: available"
     fi
-    TFA_DIR=${topdir}/build/${build}/bsp_sources/trusted-firmware-a
+    TFA_DIR=${topdir}/build/${build}/bsp_sources/arm-trusted-firmware
 
     if [ ! -d optee_os ]; then
         cd ${topdir}/build/${build}/bsp_sources
@@ -102,11 +102,11 @@ machine=$1
 bsp_version=$2
 
     cd $TFA_DIR
-    target_board=($(read_machine_config ${machine} atf_target_board ${bsp_version}))
+    export target_board=($(read_machine_config ${machine} atf_target_board ${bsp_version}))
     make_args=($(read_machine_config ${machine} atf_make_args ${bsp_version}))
 
     log "> ATF: building .."
-    make -j`nproc` ARCH=aarch64 CROSS_COMPILE=${cross_compile} PLAT=k3 TARGET_BOARD=${target_board} SPD=opteed ${make_args} &>>"${LOG_FILE}"
+    make -j`nproc` ARCH=aarch64 CROSS_COMPILE=${cross_compile} PLAT=k3 TARGET_BOARD=${target_board} ${make_args} &>>"${LOG_FILE}"
 }
 
 function build_optee() {
@@ -133,23 +133,35 @@ bsp_version=$2
     uboot_r5_defconfig=`echo $uboot_r5_defconfig | tr ',' ' '`
     uboot_a53_defconfig=($(read_machine_config ${machine} uboot_a53_defconfig ${bsp_version}))
 
-    cd ${UBOOT_DIR}
-    log "> uboot-r5: building .."
-    make -j`nproc` ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabihf- ${uboot_r5_defconfig} O=${UBOOT_DIR}/out/r5 &>>"${LOG_FILE}"
-    make -j`nproc` ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabihf- O=${UBOOT_DIR}/out/r5 BINMAN_INDIRS=${FW_DIR} &>>"${LOG_FILE}"
-    cp ${UBOOT_DIR}/out/r5/tiboot3*.bin ${topdir}/build/${build}/tisdk-debian-${distro}-${bsp_version}-boot/ &>> ${LOG_FILE}
+    tiboot3_core_dir="a53"
+    if [ ! -z "${uboot_r5_defconfig}" ] ; then
+        cd ${UBOOT_DIR}
+        log "> uboot-r5: building .."
+        make -j`nproc` ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabihf- ${uboot_r5_defconfig} O=${UBOOT_DIR}/out/r5 &>>"${LOG_FILE}"
+        make -j`nproc` ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabihf- O=${UBOOT_DIR}/out/r5 BINMAN_INDIRS=${FW_DIR} &>>"${LOG_FILE}"
+        tiboot3_core_dir="r5"
+#        cp ${UBOOT_DIR}/out/r5/tiboot3*.bin ${topdir}/build/${build}/tisdk-debian-${distro}-${bsp_version}-boot/ &>> ${LOG_FILE}
+    fi
 
     cd ${UBOOT_DIR}
     log "> uboot-a53: building .."
+    bl1_path=""
+    if [[ ${machine} == "am62lxx-evm" ]] ; then
+        bl1_path="BL1=${TFA_DIR}/build/k3/am62l/release/bl1.bin"
+        echo "${bl1_path}"
+    fi
     make -j`nproc` ARCH=arm CROSS_COMPILE=${cross_compile} ${uboot_a53_defconfig} O=${UBOOT_DIR}/out/a53 &>>"${LOG_FILE}"
-    make -j`nproc` ARCH=arm CROSS_COMPILE=${cross_compile} BL31=${TFA_DIR}/build/k3/lite/release/bl31.bin TEE=${OPTEE_DIR}/out/arm-plat-k3/core/tee-pager_v2.bin O=${UBOOT_DIR}/out/a53 BINMAN_INDIRS=${topdir}/build/${build}/bsp_sources/ti-linux-firmware &>>"${LOG_FILE}"
+    make -j`nproc` ARCH=arm CROSS_COMPILE=${cross_compile} BL31=${TFA_DIR}/build/k3/${target_board}/release/bl31.bin ${bl1_path} TEE=${OPTEE_DIR}/out/arm-plat-k3/core/tee-pager_v2.bin O=${UBOOT_DIR}/out/a53 BINMAN_INDIRS=${topdir}/build/${build}/bsp_sources/ti-linux-firmware &>>"${LOG_FILE}"
     cp ${UBOOT_DIR}/out/a53/tispl.bin ${topdir}/build/${build}/tisdk-debian-${distro}-${bsp_version}-boot/ &>> ${LOG_FILE}
+    cp ${UBOOT_DIR}/out/${tiboot3_core_dir}/tiboot3.bin ${topdir}/build/${build}/tisdk-debian-${distro}-${bsp_version}-boot/ &>> ${LOG_FILE}
     cp ${UBOOT_DIR}/out/a53/u-boot.img ${topdir}/build/${build}/tisdk-debian-${distro}-${bsp_version}-boot/ &>> ${LOG_FILE}
 
 	case ${machine} in
 		am62pxx-evm | am62xx-evm | am62xx-lp-evm | am62xxsip-evm)
 			cp ${UBOOT_DIR}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${topdir}/build/${build}/tisdk-debian-${distro}-${bsp_version}-boot/ &>> ${LOG_FILE}
 			;;
+        am62lxx-evm)
+            cp ${topdir}/target/uEnv/uEnv-am62lxx-evm.txt ${topdir}/build/${build}/tisdk-debian-${distro}-${bsp_version}-boot/uEnv.txt &>> ${LOG_FILE}
 	esac
 }
 
diff --git a/target/uEnv/uEnv-am62lxx-evm.txt b/target/uEnv/uEnv-am62lxx-evm.txt
new file mode 100644
index 0000000..7215ef2
--- /dev/null
+++ b/target/uEnv/uEnv-am62lxx-evm.txt
@@ -0,0 +1 @@
+optargs=vt.global_cursor_default=0