Commit c19bf247 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Environment location config should be modified only if ENV_DEVICE is supplied

parent edf51f71
...@@ -21,7 +21,7 @@ opiplus2e: opiplus2e-boot-cmd opiplus2e-fw_env.config ...@@ -21,7 +21,7 @@ opiplus2e: opiplus2e-boot-cmd opiplus2e-fw_env.config
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPIPLUS2E" > /etc/fw_env.config @echo "$$FW_ENV_OPIPLUS2E" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2020.04 rm -rf u-boot-2020.04
...@@ -71,7 +71,7 @@ opiplus2e-mender: opiplus2e-boot-cmd-mender opiplus2e-fw_env.config-mender ...@@ -71,7 +71,7 @@ opiplus2e-mender: opiplus2e-boot-cmd-mender opiplus2e-fw_env.config-mender
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPIPLUS2E_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_OPIPLUS2E_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2020.04 rm -rf u-boot-2020.04
...@@ -116,7 +116,7 @@ opipcplus: opipcplus-boot-cmd opipcplus-fw_env.config ...@@ -116,7 +116,7 @@ opipcplus: opipcplus-boot-cmd opipcplus-fw_env.config
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPIPCPLUS" > /etc/fw_env.config @echo "$$FW_ENV_OPIPCPLUS" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2020.04 rm -rf u-boot-2020.04
...@@ -166,7 +166,7 @@ opipcplus-mender: opipcplus-boot-cmd-mender opipcplus-fw_env.config-mender ...@@ -166,7 +166,7 @@ opipcplus-mender: opipcplus-boot-cmd-mender opipcplus-fw_env.config-mender
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_OPIPCPLUS_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_OPIPCPLUS_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2020.04 rm -rf u-boot-2020.04
...@@ -202,7 +202,7 @@ terasicde10standard: terasicde10standard-boot-cmd terasicde10standard-fw_env.con ...@@ -202,7 +202,7 @@ terasicde10standard: terasicde10standard-boot-cmd terasicde10standard-fw_env.con
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_TERASICDE10STANDARD" > /etc/fw_env.config @echo "$$FW_ENV_TERASICDE10STANDARD" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
rm -rf u-boot-2020.04 rm -rf u-boot-2020.04
terasicde10standard-boot-cmd: terasicde10standard-boot-cmd:
...@@ -239,7 +239,7 @@ terasicde10standard-mender: terasicde10standard-boot-cmd-mender terasicde10stand ...@@ -239,7 +239,7 @@ terasicde10standard-mender: terasicde10standard-boot-cmd-mender terasicde10stand
ln -sf /sbin/fw_printenv /sbin/fw_setenv ln -sf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_TERASICDE10STANDARD_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_TERASICDE10STANDARD_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
rm -rf u-boot-2020.04 rm -rf u-boot-2020.04
terasicde10standard-boot-cmd-mender: terasicde10standard-boot-cmd-mender:
...@@ -280,7 +280,7 @@ rpi3b: rpi3b-boot-cmd rpi3b-fw_env.config rpi3b-config ...@@ -280,7 +280,7 @@ rpi3b: rpi3b-boot-cmd rpi3b-fw_env.config rpi3b-config
@echo "$$FW_ENV_RPI3" > /etc/fw_env.config @echo "$$FW_ENV_RPI3" > /etc/fw_env.config
dd if=/dev/zero of=/uboot/uboot.env bs=1024 count=16 dd if=/dev/zero of=/uboot/uboot.env bs=1024 count=16
/sbin/fw_setenv reset /sbin/fw_setenv reset
sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2020.04 rm -rf u-boot-2020.04
...@@ -336,7 +336,7 @@ rpi3b-mender: rpi3b-boot-cmd-mender rpi3b-fw_env.config-mender rpi3b-config-mend ...@@ -336,7 +336,7 @@ rpi3b-mender: rpi3b-boot-cmd-mender rpi3b-fw_env.config-mender rpi3b-config-mend
ln -svf /sbin/fw_printenv /sbin/fw_setenv ln -svf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_RPI3_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_RPI3_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2020.04 rm -rf u-boot-2020.04
...@@ -399,7 +399,7 @@ amlogics905x: amlogics905x-boot-cmd amlogics905x-fw_env.config ...@@ -399,7 +399,7 @@ amlogics905x: amlogics905x-boot-cmd amlogics905x-fw_env.config
@echo "$$FW_ENV_AMLOGICS905X" > /etc/fw_env.config @echo "$$FW_ENV_AMLOGICS905X" > /etc/fw_env.config
dd if=/dev/zero of=/uboot/uboot.env bs=1024 count=16 dd if=/dev/zero of=/uboot/uboot.env bs=1024 count=16
/sbin/fw_setenv reset /sbin/fw_setenv reset
sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2020.04 rm -rf u-boot-2020.04
...@@ -450,7 +450,7 @@ amlogics905x-mender: amlogics905x-boot-cmd-mender amlogics905x-fw_env.config-men ...@@ -450,7 +450,7 @@ amlogics905x-mender: amlogics905x-boot-cmd-mender amlogics905x-fw_env.config-men
ln -svf /sbin/fw_printenv /sbin/fw_setenv ln -svf /sbin/fw_printenv /sbin/fw_setenv
@echo "$$FW_ENV_AMLOGICS905X_MENDER" > /etc/fw_env.config @echo "$$FW_ENV_AMLOGICS905X_MENDER" > /etc/fw_env.config
/sbin/fw_setenv reset /sbin/fw_setenv reset
sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config if [ -n "$(ENV_DEVICE)" ]; then sed -i 's/$(ROOT_DEVICE)/$(ENV_DEVICE)/' /etc/fw_env.config; fi
umount /dev/$(DISK)1 umount /dev/$(DISK)1
rm -rf u-boot-2020.04 rm -rf u-boot-2020.04
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment