diff options
| author | Alexander Aring <alex.aring@gmail.com> | 2014-07-09 10:25:31 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2014-07-09 10:39:57 +0200 |
| commit | f0e6e15d80e56d32792ad8a59e99606e19ee0aef (patch) | |
| tree | 843be957806188a97f267b25b4bd9d4bd1786d92 /scripts/lib/ptxd_make_dts_dtc.sh | |
| parent | 37ede074bbc08307d41683a3ac738b67b1310b4b (diff) | |
| download | ptxdist-f0e6e15d80e56d32792ad8a59e99606e19ee0aef.tar.gz ptxdist-f0e6e15d80e56d32792ad8a59e99606e19ee0aef.tar.xz | |
ptxd_make_dts_dtc: handle error if dtc failed
This patch adds error handling for the ptxd_make_dts_dtb function.
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_dts_dtc.sh')
| -rw-r--r-- | scripts/lib/ptxd_make_dts_dtc.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/lib/ptxd_make_dts_dtc.sh b/scripts/lib/ptxd_make_dts_dtc.sh index 24c56041c..2af8405e1 100644 --- a/scripts/lib/ptxd_make_dts_dtc.sh +++ b/scripts/lib/ptxd_make_dts_dtc.sh @@ -29,7 +29,7 @@ ptxd_make_dts_dtb() { deps="${ptx_state_dir}/dtc.$(basename "${dts}").deps" tmp_deps="${PTXDIST_TEMPDIR}/dts.deps" - echo "CPP $(ptxd_print_path "${tmp_dts}")" + echo "CPP $(ptxd_print_path "${tmp_dts}")" && cpp \ -Wp,-MD,${tmp_deps} \ -Wp,-MT,${tmp_dts} \ @@ -42,22 +42,22 @@ ptxd_make_dts_dtb() { -I${dts_kernel_dir}/include \ -undef -D__DTS__ -x assembler-with-cpp \ -o ${tmp_dts} \ - ${dts} + ${dts} && sed -e "s;^${tmp_dts}:;${dts_dtb}:;" \ - -e 's;^ \([^ ]*\); $(wildcard \1);' "${tmp_deps}" > "${deps}" + -e 's;^ \([^ ]*\); $(wildcard \1);' "${tmp_deps}" > "${deps}" && if dtc -h 2>&1 | grep -q '^[[:space:]]\+-i\(,.*\)\?$'; then dtc_include="-i $(dirname "${dts}") -i ${dts_kernel_dir}/arch/${dts_kernel_arch}/boot/dts" - fi + fi && - echo "DTC $(ptxd_print_path "${dts_dtb}")" + echo "DTC $(ptxd_print_path "${dts_dtb}")" && dtc \ $(ptxd_get_ptxconf PTXCONF_DTC_EXTRA_ARGS) \ ${dtc_include} \ -d "${tmp_deps}" \ -I dts -O dtb -b 0 \ - -o "${dts_dtb}" "${tmp_dts}" + -o "${dts_dtb}" "${tmp_dts}" && awk '{ \ printf "%s", $1 ; \ @@ -65,6 +65,8 @@ ptxd_make_dts_dtb() { printf " $(wildcard %s)", $i; \ }; \ print "" \ - }' "${tmp_deps}" >> "${deps}" + }' "${tmp_deps}" >> "${deps}" || + + ptxd_bailout "Unable to generate dtb file." } export -f ptxd_make_dts_dtb |