PDK-6626: Unable to rebuild board LLD since top level makefile is not packaged

- This is because we use "jacinto" as the directory name when we package PDK now
- Due to this the PDK_SOC variable is set to jacinto when the steenv script is called
- Instead set a default SOC so that the compilation goes through by default
- User can always override the PDK_SOC variable if need to build for another SOC
in the same family

Signed-off-by: Sivaraj R <sivaraj@ti.com>

diff --git a/packages/pdksetupenv.bat b/packages/pdksetupenv.bat
index 43ad1953fa6eced356f27073a22624696d25b02f..19bb1490f07f544b9eab6655a3911d078aa73dca 100644 (file)
--- a/packages/pdksetupenv.bat
+++ b/packages/pdksetupenv.bat
@@ -46,6 +46,14 @@ for %%a  in (%s%) do (
 for /f "tokens=1,2,3,4,5 delims=/_" %%a in ("%pdkdir%") do set pdksoc=%%b&set v1=%%c&set v2=%%d&set v3=%%e\r
 set pdkdir_ver=%v1%_%v2%_%v3%\r
 \r
+@REM When pdk folder represents a device family, set a default SOC for that family\r
+if %pdksoc% == jacinto (\r
+    set pdksoc=am65xx\r
+)\r
+if %pdksoc% == sitara (\r
+    set pdksoc=am64x\r
+)\r
+\r
 @REM Go to the SDK install directory\r
 cd %PDK_INSTALL_PATH%\..\..\r
 \r

diff --git a/packages/pdksetupenv.sh b/packages/pdksetupenv.sh
index 2912f2d3450542b4f97c0711db54bad23f4a335f..a3b831f13fc6fb2c025f6bb9c17bf6391a97b207 100755 (executable)
--- a/packages/pdksetupenv.sh
+++ b/packages/pdksetupenv.sh
@@ -51,6 +51,13 @@ cd ..
 CURDIR_LAST=${PWD##*/}
 IFS='_' read -ra ADDR <<< "$CURDIR_LAST"
 
+# When pdk folder represents a device family, set a default SOC for that family
+if [ ${ADDR[1]} == "jacinto" ]; then
+    ADDR[1]="am65xx"
+fi
+if [ ${ADDR[1]} == "sitara" ]; then
+    ADDR[1]="am64x"
+fi
 
 if [ -z $PDK_SOC ]; then
    export PDK_SOC=${ADDR[1]}