Skip to content

Commit 36e2451

Browse files
author
Christophe Priouzeau
committed
SDK-INFO: script correct bad external-dt configuration for kernel
Signed-off-by: Christophe Priouzeau <[email protected]>
1 parent 1fff39f commit 36e2451

File tree

1 file changed

+79
-14
lines changed

1 file changed

+79
-14
lines changed

‎recipes-support/sdk-infos/files/generated_build_script-stm32mpx.sh

Lines changed: 79 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ function config_stm32mp1_externaldt() {
9898
echo "tfa_dt_programmer_name=\$your_board_name"
9999
echo "# Linux kernel dt name"
100100
echo "# linux"
101-
echo "externaldt_linux_path=\$your_board_name"
101+
echo "linux_dtb_name=\$your_board_name"
102102
}
103103
function config_stm32mp1_mx() {
104104
echo "# define the cube mx project name"
@@ -150,7 +150,7 @@ function config_stm32mp1_mx() {
150150
echo "tfa_dt_programmer_name=\$your_board_name"
151151
echo "# Linux kernel dt name"
152152
echo "# linux"
153-
echo "externaldt_linux_path=\$your_board_name"
153+
echo "linux_dtb_name=\$your_board_name"
154154
}
155155
function config_stm32mp1() {
156156
local mx=$1
@@ -262,7 +262,7 @@ function config_stm32mp2_externaldt() {
262262
echo "tfa_dt_programmer_name=\$your_board_name"
263263
echo "# Linux kernel dt name"
264264
echo "# linux"
265-
echo "externaldt_linux_path=\$your_board_name"
265+
echo "linux_dtb_name=\$your_board_name"
266266
}
267267
function config_stm32mp2_mx() {
268268
echo "# define the cube mx project name"
@@ -313,7 +313,7 @@ function config_stm32mp2_mx() {
313313
echo "tfa_dt_programmer_name=\$your_board_name"
314314
echo "# Linux kernel dt name"
315315
echo "# linux"
316-
echo "externaldt_linux_path=\$your_board_name"
316+
echo "linux_dtb_name=\$your_board_name"
317317
}
318318
function config_stm32mp2() {
319319
local mx=$1
@@ -764,11 +764,11 @@ function generate_action_programmer() {
764764
echo " action_set"
765765
for c in ${COMPONENTS_FIP};
766766
do
767-
echo " ${c}_compile"
767+
echo " ${c}_programmer_compile"
768768
done
769769
for c in ${COMPONENTS_FIP};
770770
do
771-
echo " ${c}_deploy"
771+
echo " ${c}_programmer_deploy"
772772
done
773773
}
774774
function generate_action_set() {
@@ -827,6 +827,18 @@ function generate_action_component() {
827827
echo "${c}-clean)"
828828
echo " ${c}_clean"
829829
echo " ;;"
830+
831+
# case of linux-stm32mp
832+
if [ "${c}" = "linux-stm32mp" ]; then
833+
echo "${c}-dtb)"
834+
echo " action_set"
835+
echo " ${c}_dtb"
836+
echo " ;;"
837+
echo "${c}-dts)"
838+
echo " action_set"
839+
echo " ${c}_dts"
840+
echo " ;;"
841+
fi
830842
done
831843
}
832844
function generate_component_list() {
@@ -1032,8 +1044,8 @@ function generate_component_function() {
10321044
echo " echo \"**** ${c}_deploy ****END****\""
10331045
echo "}"
10341046

1035-
echo "function ${c}_programmer-compile {"
1036-
echo " echo \"**** ${c}_programmer-compile ****START****\""
1047+
echo "function ${c}_programmer_compile {"
1048+
echo " echo \"**** ${c}_programmer_compile ****START****\""
10371049
if [ $programmer_compile_nb -gt 0 ]; then
10381050
echo " localpath=\$PWD"
10391051
old_IFS=$IFS
@@ -1046,7 +1058,7 @@ function generate_component_function() {
10461058
echo "${local_tmp_data}" | sed "s|[[:space:]]*\$@P>| |"
10471059
fi
10481060
done
1049-
echo " export BLD_PATH=\${your_build_subdir_path}"
1061+
echo " export BLD_PATH=\${your_build_subdir_path}-programmer"
10501062
for d in ${data};
10511063
do
10521064
if $(echo ${d} | grep -q '@PC') ; then
@@ -1058,11 +1070,11 @@ function generate_component_function() {
10581070
IFS=$old_IFS
10591071
echo " cd \$localpath"
10601072
fi
1061-
echo " echo \"**** ${c}_programmer-compile ****END****\""
1073+
echo " echo \"**** ${c}_programmer_compile ****END****\""
10621074
echo "}"
10631075

1064-
echo "function ${c}_programmer-deploy {"
1065-
echo " echo \"**** ${c}_programmer-deploy ****START****\""
1076+
echo "function ${c}_programmer_deploy {"
1077+
echo " echo \"**** ${c}_programmer_deploy ****START****\""
10661078
if [ $programmer_fip_nb -gt 0 ]; then
10671079
echo " localpath=\$PWD"
10681080
old_IFS=$IFS
@@ -1075,7 +1087,7 @@ function generate_component_function() {
10751087
echo "${local_tmp_data}" | sed "s|[[:space:]]*\$@P>| |"
10761088
fi
10771089
done
1078-
echo " export BLD_PATH=\${your_build_subdir_path}"
1090+
echo " export BLD_PATH=\${your_build_subdir_path}-programmer"
10791091
for d in ${data};
10801092
do
10811093
if $(echo ${d} | grep -q '@PF') ; then
@@ -1087,7 +1099,7 @@ function generate_component_function() {
10871099
IFS=$old_IFS
10881100
echo " cd \$localpath"
10891101
fi
1090-
echo " echo \"**** ${c}_programmer-deploy ****END****\""
1102+
echo " echo \"**** ${c}_programmer_deploy ****END****\""
10911103
echo "}"
10921104

10931105
echo "function ${c}_clean {"
@@ -1126,6 +1138,56 @@ function generate_component_function() {
11261138
echo " echo \"**** ${c}_clean ****END****\""
11271139
echo "}"
11281140

1141+
# case of linux-stm32mp
1142+
if [ "${c}" = "linux-stm32mp" ]; then
1143+
echo "function ${c}_dtb {"
1144+
echo " echo \"**** ${c}_compile ****START****\""
1145+
echo " localpath=\$PWD"
1146+
old_IFS=$IFS
1147+
IFS=$'\n'
1148+
for d in ${data};
1149+
do
1150+
if $(echo ${d} | grep -q '@P>') ; then
1151+
local_tmp_data=$(process_data ${d})
1152+
echo " cmd \"${local_tmp_data}\"" | sed "s|[[:space:]]*\$@P>||"
1153+
echo "${local_tmp_data}" | sed "s|[[:space:]]*\$@P>| |"
1154+
fi
1155+
done
1156+
echo " export BLD_PATH=\${your_build_subdir_path}"
1157+
echo " cmd export OUTPUT_BUILD_DIR=\$PWD/../build"
1158+
echo " export OUTPUT_BUILD_DIR=\$PWD/../build"
1159+
local_tmp_data=" make O=\"\${OUTPUT_BUILD_DIR}\" \${PARALLEL_MAKE} st/\${linux_dtb_name}.dtb KBUILD_EXTDTS=\${externaldt_path}/\${externaldt_linux_path}"
1160+
echo " cmd \"${local_tmp_data}\"" | sed "s|[[:space:]]*\$@C>||"
1161+
echo "${local_tmp_data} || die ${c}" | sed "s|[[:space:]]*\$@C>| |"
1162+
IFS=$old_IFS
1163+
echo " cd \$localpath"
1164+
echo " echo \"**** ${c}_dtb ****END****\""
1165+
echo "}"
1166+
1167+
echo "function ${c}_dtbs {"
1168+
echo " echo \"**** ${c}_dtbs ****START****\""
1169+
echo " localpath=\$PWD"
1170+
old_IFS=$IFS
1171+
IFS=$'\n'
1172+
for d in ${data};
1173+
do
1174+
if $(echo ${d} | grep -q '@P>') ; then
1175+
local_tmp_data=$(process_data ${d})
1176+
echo " cmd \"${local_tmp_data}\"" | sed "s|[[:space:]]*\$@P>||"
1177+
echo "${local_tmp_data}" | sed "s|[[:space:]]*\$@P>| |"
1178+
fi
1179+
done
1180+
echo " export BLD_PATH=\${your_build_subdir_path}"
1181+
echo " cmd export OUTPUT_BUILD_DIR=\$PWD/../build"
1182+
echo " export OUTPUT_BUILD_DIR=\$PWD/../build"
1183+
local_tmp_data=" make O=\"\${OUTPUT_BUILD_DIR}\" \${PARALLEL_MAKE} dtbs KBUILD_EXTDTS=\${externaldt_path}/\${externaldt_linux_path}"
1184+
echo " cmd \"${local_tmp_data}\"" | sed "s|[[:space:]]*\$@C>||"
1185+
echo "${local_tmp_data} || die ${c}" | sed "s|[[:space:]]*\$@C>| |"
1186+
IFS=$old_IFS
1187+
echo " cd \$localpath"
1188+
echo " echo \"**** ${c}_dtbs ****END****\""
1189+
echo "}"
1190+
fi
11291191
done
11301192
}
11311193

@@ -1277,6 +1339,9 @@ $(generate_action_component)
12771339
echo " -programmer-compile"
12781340
echo " -programmer-deploy"
12791341
echo " -clean"
1342+
echo " for linux-stm32mp there is to more possible action (already included on compil)"
1343+
echo " -dtb"
1344+
echo " -dtbs"
12801345
echo "component:"
12811346
$(generate_component_list)
12821347
;;

0 commit comments

Comments
 (0)