diff options
author | Carton <joel.carron@eeproperty.ch> | 2019-07-18 12:18:51 +0200 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-20 21:56:21 +0100 |
commit | 290c152a22d8a65e87aa5198aeda4558231470b9 (patch) | |
tree | 1a51da970599621136e25540b4bebf4c6493a91b | |
parent | 43c1696ea50f27f8a8d05886c0124de8e8480f2b (diff) | |
download | meta-raspberrypi-290c152a22d8a65e87aa5198aeda4558231470b9.tar.gz |
rpi-config: Check some config values against "1"
When we read the docs, we have the feelings that theses variables are
boolean ones. So I was setting, for example in my distro.conf file the
variable ' ENABLE_I2C = "1" ' to enable I2C. Then I wanted to disable it
by simply setting 'ENABLE_I2C' to "0" but it wasn't working. So I
noticed that, for example, ' ENABLE_UART ' was checked with ' = "1" '
condition and some other "boolean" was checked against ' -n ' like for
ENABLE_I2C.
This commit tries to have an uniform behavior for all variables that are
shown in the doc under the format ' VARIABLE = "1" ' to enable them and
the reader can think they are kind of 'boolean' values.
Signed-off-by: Joël Carron <joel.carron@eeproperty.ch>
-rw-r--r-- | recipes-bsp/bootfiles/rpi-config_git.bb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb index 08c80a6..0efb274 100644 --- a/recipes-bsp/bootfiles/rpi-config_git.bb +++ b/recipes-bsp/bootfiles/rpi-config_git.bb | |||
@@ -41,7 +41,7 @@ do_deploy() { | |||
41 | if [ -n "${DISABLE_OVERSCAN}" ]; then | 41 | if [ -n "${DISABLE_OVERSCAN}" ]; then |
42 | sed -i '/#disable_overscan=/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 42 | sed -i '/#disable_overscan=/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
43 | fi | 43 | fi |
44 | if [ -n "${DISABLE_SPLASH}" ]; then | 44 | if [ "${DISABLE_SPLASH}" = "1" ]; then |
45 | sed -i '/#disable_splash=/ c\disable_splash=${DISABLE_SPLASH}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 45 | sed -i '/#disable_splash=/ c\disable_splash=${DISABLE_SPLASH}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
46 | fi | 46 | fi |
47 | 47 | ||
@@ -111,25 +111,25 @@ do_deploy() { | |||
111 | fi | 111 | fi |
112 | 112 | ||
113 | # Video camera support | 113 | # Video camera support |
114 | if [ -n "${VIDEO_CAMERA}" ]; then | 114 | if [ "${VIDEO_CAMERA}" = "1" ]; then |
115 | echo "# Enable video camera" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 115 | echo "# Enable video camera" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
116 | echo "start_x=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 116 | echo "start_x=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
117 | fi | 117 | fi |
118 | 118 | ||
119 | # Offline compositing support | 119 | # Offline compositing support |
120 | if [ -n "${DISPMANX_OFFLINE}" ]; then | 120 | if [ "${DISPMANX_OFFLINE}" = "1" ]; then |
121 | echo "# Enable offline compositing" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 121 | echo "# Enable offline compositing" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
122 | echo "dispmanx_offline=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 122 | echo "dispmanx_offline=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
123 | fi | 123 | fi |
124 | 124 | ||
125 | # SPI bus support | 125 | # SPI bus support |
126 | if [ -n "${ENABLE_SPI_BUS}" ] || [ "${PITFT}" = "1" ]; then | 126 | if [ "${ENABLE_SPI_BUS}" = "1" ] || [ "${PITFT}" = "1" ]; then |
127 | echo "# Enable SPI bus" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 127 | echo "# Enable SPI bus" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
128 | echo "dtparam=spi=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 128 | echo "dtparam=spi=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
129 | fi | 129 | fi |
130 | 130 | ||
131 | # I2C support | 131 | # I2C support |
132 | if [ -n "${ENABLE_I2C}" ] || [ "${PITFT}" = "1" ]; then | 132 | if [ "${ENABLE_I2C}" = "1" ] || [ "${PITFT}" = "1" ]; then |
133 | echo "# Enable I2C" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 133 | echo "# Enable I2C" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
134 | echo "dtparam=i2c1=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 134 | echo "dtparam=i2c1=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
135 | echo "dtparam=i2c_arm=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 135 | echo "dtparam=i2c_arm=on" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt |