Skip to content

Commit

Permalink
Updated to align with SDK 10.01.00.01
Browse files Browse the repository at this point in the history
  • Loading branch information
junechul committed Nov 13, 2024
1 parent 6ee77f4 commit ccac81b
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 24 deletions.
26 changes: 13 additions & 13 deletions .github/workflows/build-all-targets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "ubuntu:22.04"
sdk_ver: 10.0.0
sdk_ver: 10.1.0

docker_build_debian12-5:
uses: ./.github/workflows/docker-build.yml
secrets:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "debian:12.5"
sdk_ver: 10.0.0
sdk_ver: 10.1.0

## Library build: Ubuntu 22.04
build_am69a_ubuntu22-04:
Expand All @@ -29,7 +29,7 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "ubuntu:22.04"
sdk_ver: 10.0.0
sdk_ver: 10.1.0
soc: j784s4
cpu: A72

Expand All @@ -40,7 +40,7 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "ubuntu:22.04"
sdk_ver: 10.0.0
sdk_ver: 10.1.0
soc: j721s2
cpu: A72

Expand All @@ -51,7 +51,7 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "ubuntu:22.04"
sdk_ver: 10.0.0
sdk_ver: 10.1.0
soc: j721e
cpu: A72

Expand All @@ -62,7 +62,7 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "ubuntu:22.04"
sdk_ver: 10.0.0
sdk_ver: 10.1.0
soc: j722s
cpu: A53

Expand All @@ -73,7 +73,7 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "ubuntu:22.04"
sdk_ver: 10.0.0
sdk_ver: 10.1.0
soc: am62a
cpu: A53

Expand All @@ -85,7 +85,7 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "debian:12.5"
sdk_ver: 10.0.0
sdk_ver: 10.1.0
soc: j784s4
cpu: A72

Expand All @@ -96,7 +96,7 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "debian:12.5"
sdk_ver: 10.0.0
sdk_ver: 10.1.0
soc: j721s2
cpu: A72

Expand All @@ -107,7 +107,7 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "debian:12.5"
sdk_ver: 10.0.0
sdk_ver: 10.1.0
soc: j721e
cpu: A72

Expand All @@ -118,7 +118,7 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "debian:12.5"
sdk_ver: 10.0.0
sdk_ver: 10.1.0
soc: j722s
cpu: A53

Expand All @@ -129,7 +129,7 @@ jobs:
env_PAT: ${{ secrets.GHCR_PAT }}
with:
base_image: "debian:12.5"
sdk_ver: 10.0.0
sdk_ver: 10.1.0
soc: am62a
cpu: A53

Expand All @@ -150,5 +150,5 @@ jobs:
secrets:
gh_TOKEN: ${{ secrets.GHCR_PAT }}
with:
sdk_ver: 10.0.0
sdk_ver: 10.1.0

2 changes: 1 addition & 1 deletion docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARCH=arm64
: "${BASE_IMAGE:=ubuntu:22.04}"

# SDK version
: "${SDK_VER:=10.0.0}"
: "${SDK_VER:=10.1.0}"

# ti-rpmsg-char tag
: "${RPMSG_VER:=0.6.7}"
Expand Down
2 changes: 1 addition & 1 deletion docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARCH=arm64
: "${BASE_IMAGE:=ubuntu:22.04}"

# SDK version
: "${SDK_VER:=10.0.0}"
: "${SDK_VER:=10.1.0}"

# docker tag
DOCKER_TAG=vision-apps-builder:${SDK_VER}-${ARCH}-${BASE_IMAGE//:/}
Expand Down
4 changes: 2 additions & 2 deletions init_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ WORKAREA=$SCRIPT_DIR/workarea

# pull the source repos
# https://git.ti.com/cgit/processor-sdk/psdk_repo_manifests/refs/?h=main
: "${REPO_TAG:=REL.PSDK.ANALYTICS.10.00.00.04}"
: "${REPO_TAG:=REL.PSDK.ANALYTICS.10.01.00.01}"

# targetfs and rootfs info
# http://edgeaisrv2.dhcp.ti.com/publish/prod/PROCESSOR-SDK-LINUX-${DEVICE_NAME}/${PSDK_LINUX_VERSION}
# E.g.: http://edgeaisrv2.dhcp.ti.com/publish/prod/PROCESSOR-SDK-LINUX-AM69A/10_01_00_01
: "${PSDK_LINUX_VERSION:=10_00_00_08}"
: "${PSDK_LINUX_VERSION:=10_01_00_01}"

# validate ARCH
if [ "$ARCH" != "arm64" ]; then
Expand Down
3 changes: 1 addition & 2 deletions patches/sdk_builder/makerules/makefile_ipk.mak
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ J7_IP_ADDRESS ?= 192.168.999.999

# Return the last word after a '/'.
# ex: <some_dir_path>/REPO/tidl_j7_xx_yy_zz_ww will give tidl_j7_xx_yy_zz_ww
TIDL_PATH=$(PSDK_PATH)/tidl_j7
tidl_dir = $(notdir $(TIDL_PATH))

# Use this to use ALL headers in the component folders
Expand Down Expand Up @@ -59,7 +58,7 @@ ifeq ($(BUILD_PTK),yes)
IPK_INCLUDE_FOLDERS += ti-perception-toolkit/include
endif

ifeq ($(SOC), $(filter $(SOC),j721e j721s2 j784s4))
ifeq ($(SOC), $(filter $(SOC),j721e j721s2 j784s4 j742s2))
IPK_INCLUDE_FOLDERS += tiadalg
endif

Expand Down
10 changes: 5 additions & 5 deletions scripts/collect_libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ mkdir -p $TARGET_DIR

lib_files=(
# Vision-apps libs for all the platforms
$HOME/vision-apps-build/workarea/vision_apps/out/J784S4/A72/LINUX/release/libti-vision-apps-j784s4_10.0.0-ubuntu22.04.deb
$HOME/vision-apps-build/workarea/vision_apps/out/J721S2/A72/LINUX/release/libti-vision-apps-j721s2_10.0.0-ubuntu22.04.deb
$HOME/vision-apps-build/workarea/vision_apps/out/J721E/A72/LINUX/release/libti-vision-apps-j721e_10.0.0-ubuntu22.04.deb
$HOME/vision-apps-build/workarea/vision_apps/out/J722S/A53/LINUX/release/libti-vision-apps-j722s_10.0.0-ubuntu22.04.deb
$HOME/vision-apps-build/workarea/vision_apps/out/AM62A/A53/LINUX/release/libti-vision-apps-am62a_10.0.0-ubuntu22.04.deb
$HOME/vision-apps-build/workarea/vision_apps/out/J784S4/A72/LINUX/release/libti-vision-apps-j784s4_10.1.0-ubuntu22.04.deb
$HOME/vision-apps-build/workarea/vision_apps/out/J721S2/A72/LINUX/release/libti-vision-apps-j721s2_10.1.0-ubuntu22.04.deb
$HOME/vision-apps-build/workarea/vision_apps/out/J721E/A72/LINUX/release/libti-vision-apps-j721e_10.1.0-ubuntu22.04.deb
$HOME/vision-apps-build/workarea/vision_apps/out/J722S/A53/LINUX/release/libti-vision-apps-j722s_10.1.0-ubuntu22.04.deb
$HOME/vision-apps-build/workarea/vision_apps/out/AM62A/A53/LINUX/release/libti-vision-apps-am62a_10.1.0-ubuntu22.04.deb
)

for lib_file in "${lib_files[@]}"; do
Expand Down

0 comments on commit ccac81b

Please sign in to comment.