diff options
| author | Hugo Hromic <hhromic@gmail.com> | 2018-01-29 10:36:26 +0000 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.com> | 2018-01-29 18:24:15 +0000 |
| commit | 1c9986257e29f3f62567572dd1f26e4f22e274c3 (patch) | |
| tree | dbaa296804ed47176b17171a253f5fe48aad9e36 | |
| parent | 6235b0a8543bcf6704d0fe0156ab2b847a4ea0bc (diff) | |
| download | meta-raspberrypi-1c9986257e29f3f62567572dd1f26e4f22e274c3.tar.gz | |
rpi-config: fix config variables with the same initial name being overwritten
| -rw-r--r-- | recipes-bsp/bootfiles/rpi-config_git.bb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/recipes-bsp/bootfiles/rpi-config_git.bb b/recipes-bsp/bootfiles/rpi-config_git.bb index 5726123..bc6f0d8 100644 --- a/recipes-bsp/bootfiles/rpi-config_git.bb +++ b/recipes-bsp/bootfiles/rpi-config_git.bb | |||
| @@ -31,25 +31,25 @@ do_deploy() { | |||
| 31 | cp ${S}/config.txt ${DEPLOYDIR}/bcm2835-bootfiles/ | 31 | cp ${S}/config.txt ${DEPLOYDIR}/bcm2835-bootfiles/ |
| 32 | 32 | ||
| 33 | if [ -n "${KEY_DECODE_MPG2}" ]; then | 33 | if [ -n "${KEY_DECODE_MPG2}" ]; then |
| 34 | sed -i '/#decode_MPG2/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 34 | sed -i '/#decode_MPG2=/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 35 | fi | 35 | fi |
| 36 | if [ -n "${KEY_DECODE_WVC1}" ]; then | 36 | if [ -n "${KEY_DECODE_WVC1}" ]; then |
| 37 | sed -i '/#decode_WVC1/ c\decode_WVC1=${KEY_DECODE_WVC1}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 37 | sed -i '/#decode_WVC1=/ c\decode_WVC1=${KEY_DECODE_WVC1}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 38 | fi | 38 | fi |
| 39 | if [ -n "${DISABLE_OVERSCAN}" ]; then | 39 | if [ -n "${DISABLE_OVERSCAN}" ]; then |
| 40 | sed -i '/#disable_overscan/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 40 | sed -i '/#disable_overscan=/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 41 | fi | 41 | fi |
| 42 | if [ -n "${ARM_FREQ}" ]; then | 42 | if [ -n "${ARM_FREQ}" ]; then |
| 43 | sed -i '/#arm_freq/ c\arm_freq=${ARM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 43 | sed -i '/#arm_freq=/ c\arm_freq=${ARM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 44 | fi | 44 | fi |
| 45 | if [ -n "${CORE_FREQ}" ]; then | 45 | if [ -n "${CORE_FREQ}" ]; then |
| 46 | sed -i '/#core_freq/ c\core_freq=${CORE_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 46 | sed -i '/#core_freq=/ c\core_freq=${CORE_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 47 | fi | 47 | fi |
| 48 | if [ -n "${SDRAM_FREQ}" ]; then | 48 | if [ -n "${SDRAM_FREQ}" ]; then |
| 49 | sed -i '/#sdram_freq/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 49 | sed -i '/#sdram_freq=/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 50 | fi | 50 | fi |
| 51 | if [ -n "${OVER_VOLTAGE}" ]; then | 51 | if [ -n "${OVER_VOLTAGE}" ]; then |
| 52 | sed -i '/#over_voltage/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 52 | sed -i '/#over_voltage=/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 53 | fi | 53 | fi |
| 54 | 54 | ||
| 55 | # GPU memory | 55 | # GPU memory |
| @@ -57,13 +57,13 @@ do_deploy() { | |||
| 57 | sed -i '/#gpu_mem=/ c\gpu_mem=${GPU_MEM}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 57 | sed -i '/#gpu_mem=/ c\gpu_mem=${GPU_MEM}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 58 | fi | 58 | fi |
| 59 | if [ -n "${GPU_MEM_256}" ]; then | 59 | if [ -n "${GPU_MEM_256}" ]; then |
| 60 | sed -i '/#gpu_mem_256/ c\gpu_mem_256=${GPU_MEM_256}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 60 | sed -i '/#gpu_mem_256=/ c\gpu_mem_256=${GPU_MEM_256}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 61 | fi | 61 | fi |
| 62 | if [ -n "${GPU_MEM_512}" ]; then | 62 | if [ -n "${GPU_MEM_512}" ]; then |
| 63 | sed -i '/#gpu_mem_512/ c\gpu_mem_512=${GPU_MEM_512}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 63 | sed -i '/#gpu_mem_512=/ c\gpu_mem_512=${GPU_MEM_512}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 64 | fi | 64 | fi |
| 65 | if [ -n "${GPU_MEM_1024}" ]; then | 65 | if [ -n "${GPU_MEM_1024}" ]; then |
| 66 | sed -i '/#gpu_mem_1024/ c\gpu_mem_1024=${GPU_MEM_1024}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt | 66 | sed -i '/#gpu_mem_1024=/ c\gpu_mem_1024=${GPU_MEM_1024}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt |
| 67 | fi | 67 | fi |
| 68 | 68 | ||
| 69 | # Video camera support | 69 | # Video camera support |