diff mbox series

[U-Boot] tools: imx8m_image: Fix 'unexpected operator' error

Message ID 20190403143720.14547-1-ccaione@baylibre.com
State Superseded
Delegated to: Stefano Babic
Headers show
Series [U-Boot] tools: imx8m_image: Fix 'unexpected operator' error | expand

Commit Message

Carlo Caione April 3, 2019, 2:37 p.m. UTC
When sh is an alias for dash the script is failing with (for several
files):

./tools/imx8m_image.sh: 15: [: signed_hdmi_imx8m.bin: unexpected operator

This is caused by the 'a == b' bashism that should be 'a = b'.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
---
 tools/imx8m_image.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Anatolij Gustschin April 3, 2019, 2:56 p.m. UTC | #1
Hi Carlo,

On Wed,  3 Apr 2019 15:37:20 +0100
Carlo Caione ccaione@baylibre.com wrote:

> When sh is an alias for dash the script is failing with (for several
> files):
> 
> ./tools/imx8m_image.sh: 15: [: signed_hdmi_imx8m.bin: unexpected operator

Thanks, but there is already a similar patch [1] waiting for merging.
It already passed the build tests and I assume that Stefano will submit
a pull request soon for inclusion in v2019.04.

[1] http://patchwork.ozlabs.org/patch/1019908

--
Anatolij
Carlo Caione April 3, 2019, 3:01 p.m. UTC | #2
On 03/04/2019 15:56, Anatolij Gustschin wrote:
> Hi Carlo,
> 
> On Wed,  3 Apr 2019 15:37:20 +0100
> Carlo Caione ccaione@baylibre.com wrote:
> 
>> When sh is an alias for dash the script is failing with (for several
>> files):
>>
>> ./tools/imx8m_image.sh: 15: [: signed_hdmi_imx8m.bin: unexpected operator
> 
> Thanks, but there is already a similar patch [1] waiting for merging.
> It already passed the build tests and I assume that Stefano will submit
> a pull request soon for inclusion in v2019.04.
> 
> [1] http://patchwork.ozlabs.org/patch/1019908

Oh well, good to know.

Cheers,

--
Carlo Caione
Stefano Babic April 3, 2019, 3:07 p.m. UTC | #3
On 03/04/19 16:56, Anatolij Gustschin wrote:
> Hi Carlo,
> 
> On Wed,  3 Apr 2019 15:37:20 +0100
> Carlo Caione ccaione@baylibre.com wrote:
> 
>> When sh is an alias for dash the script is failing with (for several
>> files):
>>
>> ./tools/imx8m_image.sh: 15: [: signed_hdmi_imx8m.bin: unexpected operator
> 
> Thanks, but there is already a similar patch [1] waiting for merging.
> It already passed the build tests and I assume that Stefano will submit
> a pull request soon for inclusion in v2019.04.
> 
> [1] http://patchwork.ozlabs.org/patch/1019908
> 
> --

Yes, it is in u-boot-imx, I am just checking around if there are some
other patches that cannot wait and must go into 2019.04. I plan to send
my PR to Tom for the end of the week.

Regards,
Stefano
Anatolij Gustschin April 4, 2019, 8:29 a.m. UTC | #4
Hi Stefano,

On Wed, 3 Apr 2019 17:07:04 +0200
Stefano Babic sbabic@denx.de wrote:
... 
> Yes, it is in u-boot-imx, I am just checking around if there are some
> other patches that cannot wait and must go into 2019.04. I plan to send
> my PR to Tom for the end of the week.

Then you probably can apply two tested patches with FEC fixes for
i.mx8qxp MEK?

 http://patchwork.ozlabs.org/patch/1050177
 http://patchwork.ozlabs.org/patch/1050178

These were part of the last u-boot-net pull request, but this pull
request was rejected due to issues with other patches, so we still
have broken Ethernet support on MEK board.

Thanks!

--
Anatolij
Stefano Babic April 4, 2019, 9 a.m. UTC | #5
Hi Anatolji,

On 04/04/19 10:29, Anatolij Gustschin wrote:
> Hi Stefano,
> 
> On Wed, 3 Apr 2019 17:07:04 +0200
> Stefano Babic sbabic@denx.de wrote:
> ... 
>> Yes, it is in u-boot-imx, I am just checking around if there are some
>> other patches that cannot wait and must go into 2019.04. I plan to send
>> my PR to Tom for the end of the week.
> 
> Then you probably can apply two tested patches with FEC fixes for
> i.mx8qxp MEK?
> 
>  http://patchwork.ozlabs.org/patch/1050177
>  http://patchwork.ozlabs.org/patch/1050178
> 
> These were part of the last u-boot-net pull request, but this pull
> request was rejected due to issues with other patches, so we still
> have broken Ethernet support on MEK board.
> 

I can do it if Joe agree because after merging in u-boot-imx, he needs
to rebase his tree. Joe, what do you mind ?

> Thanks!
> 

Regards,
Stefano
diff mbox series

Patch

diff --git a/tools/imx8m_image.sh b/tools/imx8m_image.sh
index 6346fb64d8..ec0881a128 100755
--- a/tools/imx8m_image.sh
+++ b/tools/imx8m_image.sh
@@ -12,7 +12,7 @@  blobs=`awk '/^SIGNED_HDMI/ {print $2} /^LOADER/ {print $2} /^SECOND_LOADER/ {pri
 for f in $blobs; do
 	tmp=$srctree/$f
 
-	if [ $f == "spl/u-boot-spl-ddr.bin" ] || [ $f == "u-boot.itb" ]; then
+	if [ $f = "spl/u-boot-spl-ddr.bin" ] || [ $f = "u-boot.itb" ]; then
 		continue
 	fi
 
@@ -28,7 +28,7 @@  for f in $blobs; do
 	sed -in "s;$f;$tmp;" $file
 done
 
-if [ $post_process == 1 ]; then
+if [ $post_process = 1 ]; then
 	if [ -f $srctree/lpddr4_pmu_train_1d_imem.bin ]; then
 		objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 $srctree/lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_imem_pad.bin
 		objcopy -I binary -O binary --pad-to 0x4000 --gap-fill=0x0 $srctree/lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_dmem_pad.bin