dt-processor.sh: Define dts subdirectory differently

The generated DTS files will be installed into the same directory as the
automatically generated machine name.  This provides a method for the user
to specify an alternative directory name instead.

Note, if the machine name is defined by the user, the dts directory is not
changed from the default without using this additional argument.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 32 insertions, 26 deletions

diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
index 6482a9bf..c51e209c 100755
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
@@ -40,6 +40,7 @@ $0
     [-o <overlay_dts>]      Generate overlay dts
     [-e <external_fpga>]    Apply a partial overlay
     [-m <machine_conf>]     The name of the machine .conf to generate
+    [-D <dts_name>]         Directory to place DTS files in (usually auto detected from DTS)
     [-t <machine>]          Machine type: zynqmp or versal (usually auto detected)
     [-v <soc_variant>]      SOC Variant: cg, dr, eg, ev, ai-prime, premium (usually auto detected)
     [-p <psu_init_path>]    Path to psu_init files, defaults to system_dts path
@@ -55,7 +56,7 @@ parse_args() {
   [ $# -eq 0 ] && usage
   [ $1 = "--help" ] && usage
 
-  while getopts ":c:s:d:o:e:m:l:hP:p:i:t:v:" opt; do
+  while getopts ":c:s:d:o:e:m:D:l:hP:p:i:t:v:" opt; do
     case ${opt} in
       c) config_dir=$OPTARG ;;
       s) system_dts=$OPTARG ;;
@@ -63,6 +64,7 @@ parse_args() {
       d) domain_file=$OPTARG ;;
       e) external_fpga=$OPTARG ;;
       m) mach_conf=$OPTARG ; mach_conf=${mach_conf%%.conf} ;;
+      D) dts_name=$OPTARG ;;
       t) machine=$OPTARG ;;
       v) soc_variant=$OPTARG ;;
       p) psu_init_path=$OPTARG ;;
@@ -200,7 +202,7 @@ cortex_a53_linux() {
 
   # Check if it is overlay dts otherwise just create linux dts
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     if [ "${overlay_dts}" = "true" ]; then
       if [ "${external_fpga}" = "true" ]; then
         LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" -- xlnx_overlay_dt ${machine} full \
@@ -233,7 +235,7 @@ cortex_a53_linux() {
 
   ## Generate a multiconfig
   cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 EOF
@@ -269,7 +271,7 @@ cortex_a53_baremetal() {
 
   # Build device tree
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     if [ -n "${domain_file}" ]; then
       LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
         -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dts}" "${dts_file}" \
@@ -310,7 +312,7 @@ EOF
     cat /dev/null >"${conf_file}"
   fi
   cat <<EOF >>"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexa53"
@@ -336,7 +338,7 @@ cortex_a53_freertos() {
 
   # Build device tree
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     if [ -n "${domain_file}" ]; then
       LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f  --enhanced -x '*.yaml' \
         -i "${domain_file}" -i "${lops_dir}/lop-a53-imux.dts" "${system_dts}" "${dts_file}" \
@@ -362,7 +364,7 @@ cortex_a53_freertos() {
   sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexa53"
@@ -397,7 +399,7 @@ cortex_a72_linux() {
   fi
 
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     # Check if it is overlay dts otherwise just create linux dts
     if [ "${overlay_dts}" = "true" ]; then
       # As there is no partial support on Versal, As per fpga manager implementation there is
@@ -433,7 +435,7 @@ cortex_a72_linux() {
 
   ## Generate a multiconfig
   cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 TMPDIR = "\${BASE_TMPDIR}/tmp-${mc_name}"
 EOF
@@ -454,7 +456,7 @@ cortex_a72_baremetal() {
 
   # Build device tree
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     if [ -n "${domain_file}" ]; then
       LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f   --enhanced -x '*.yaml' \
         -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dts}" "${dts_file}" \
@@ -480,7 +482,7 @@ cortex_a72_baremetal() {
   sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexa72"
@@ -506,7 +508,7 @@ cortex_a72_freertos() {
 
   # Build device tree
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     if [ -n "${domain_file}" ]; then
       LOPPER_DTC_FLAGS="-b 0 -@" lopper -f --enhanced -x '*.yaml' \
         -i "${domain_file}" -i "${lops_dir}/lop-a72-imux.dts" "${system_dts}" "${dts_file}" \
@@ -532,7 +534,7 @@ cortex_a72_freertos() {
   sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexa72"
@@ -573,7 +575,7 @@ cortex_r5_baremetal() {
 
   # Build device tree
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     if [ -n "$domain_file" ]; then
       LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
         -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dts}" "${dts_file}" \
@@ -613,7 +615,7 @@ EOF
     cat /dev/null >"${conf_file}"
   fi
   cat <<EOF >>"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexr5"
@@ -639,7 +641,7 @@ cortex_r5_freertos() {
 
   # Build device tree
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     if [ -n "$domain_file" ]; then
       LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -x '*.yaml' \
         -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dts}" "${dts_file}" \
@@ -665,7 +667,7 @@ cortex_r5_freertos() {
   sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 ESW_MACHINE = "$3"
 DEFAULTTUNE = "cortexr5"
@@ -685,7 +687,7 @@ process_microblaze() {
 
   mkdir -p machine/include/${mach_conf}
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-microblaze-yocto.dts" "${system_dts}" \
       || error "lopper failed"
     rm -f lop-microblaze-yocto.dts.dtb
@@ -715,7 +717,7 @@ pmu-microblaze() {
 
   # Build device tree
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
   )
 
@@ -733,7 +735,7 @@ pmu-microblaze() {
   sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 ESW_MACHINE = "$1"
 
@@ -766,7 +768,7 @@ pmc-microblaze() {
 
   # Build device tree
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
   )
 
@@ -784,7 +786,7 @@ pmc-microblaze() {
   sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 ESW_MACHINE = "$1"
 
@@ -817,7 +819,7 @@ psm-microblaze() {
 
   # Build device tree
   (
-    cd dts/${mach_conf} || error "Unable to cd to dts/${mach_conf} dir"
+    cd dts/${dts_name} || error "Unable to cd to dts/${dts_name} dir"
     LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f "${system_dts}" "${dts_file}" || error "lopper failed"
   )
 
@@ -835,7 +837,7 @@ psm-microblaze() {
   sed -i ${features} -e "s,DISTRO_FEATURES,MACHINE_FEATURES,"
 
   cat <<EOF >"${conf_file}"
-CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${mach_conf}/${dts_file}"
+CONFIG_DTFILE = "\${TOPDIR}/conf/dts/${dts_name}/${dts_file}"
 
 ESW_MACHINE = "$1"
 
@@ -891,7 +893,7 @@ EOF
   cat <<EOF >>"${conf_file}"
 
 # Set the default (linux) domain device tree
-CONFIG_DTFILE ?= "\${TOPDIR}/conf/dts/${mach_conf}/${system_conf}"
+CONFIG_DTFILE ?= "\${TOPDIR}/conf/dts/${dts_name}/${system_conf}"
 CONFIG_DTFILE[vardepsexclude] += "TOPDIR"
 
 require conf/machine/${incmachine}
@@ -1172,6 +1174,10 @@ if [ -z "${mach_conf}" ]; then
     mach_conf=${local_mach_conf}
 fi
 
+if [ -z "${dts_name}" ]; then
+    dts_name=${local_mach_conf}
+fi
+
 # Generate CPU list
 (
   cd dts || error "Unable to cd to dts dir"
@@ -1183,7 +1189,7 @@ fi
 detect_machine
 # Now that we know the machine name, we can create the directory
 mkdir -p machine/include/${mach_conf}
-mkdir -p dts/${mach_conf}
+mkdir -p dts/${dts_name}
 
 echo "System Configuration:"
 echo "MODEL       = \"${model}\""