1 files changed, 46 insertions, 41 deletions
diff --git a/recipes-bcm/bootfiles/rpi-config_git.bb b/recipes-bcm/bootfiles/rpi-config_git.bb
index 66a8fa8..9b5c1e6 100644
--- a/recipes-bcm/bootfiles/rpi-config_git.bb
+++ b/recipes-bcm/bootfiles/rpi-config_git.bb
@@ -15,49 +15,54 @@ S = "${WORKDIR}/git"
 PR = "r4"
-addtask deploy before do_package after do_install
+inherit deploy
 do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles
+    install -d ${DEPLOYDIR}/bcm2835-bootfiles
-        cp config.txt ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/
-        if [ -n "${KEY_DECODE_MPG2}" ]; then
+    cp ${S}/config.txt ${DEPLOYDIR}/bcm2835-bootfiles/
-                sed -i '/#decode_MPG2/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
-        fi
+    if [ -n "${KEY_DECODE_MPG2}" ]; then
-        if [ -n "${KEY_DECODE_WVC1}" ]; then
+        sed -i '/#decode_MPG2/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-                sed -i '/#decode_WVC1/ c\decode_MVC1=${KEY_DECODE_WVC1}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    fi
-        fi
+    if [ -n "${KEY_DECODE_WVC1}" ]; then
-        if [ -n "${DISABLE_OVERSCAN}" ]; then
+        sed -i '/#decode_WVC1/ c\decode_MVC1=${KEY_DECODE_WVC1}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-                sed -i '/#disable_overscan/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    fi
-        fi
+    if [ -n "${DISABLE_OVERSCAN}" ]; then
-        if [ -n "${ARM_FREQ}" ]; then
+        sed -i '/#disable_overscan/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-                sed -i '/#arm_freq/ c\arm_freq=${ARM_FREQ}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    fi
-        fi
+    if [ -n "${ARM_FREQ}" ]; then
-        if [ -n "${CORE_FREQ}" ]; then
+        sed -i '/#arm_freq/ c\arm_freq=${ARM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-                sed -i '/#core_freq/ c\core_freq=${CORE_FREQ}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    fi
-        fi
+    if [ -n "${CORE_FREQ}" ]; then
-        if [ -n "${SDRAM_FREQ}" ]; then
+        sed -i '/#core_freq/ c\core_freq=${CORE_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-                sed -i '/#sdram_freq/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    fi
-        fi
+    if [ -n "${SDRAM_FREQ}" ]; then
-        if [ -n "${OVER_VOLTAGE}" ]; then
+        sed -i '/#sdram_freq/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-                sed -i '/#over_voltage/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    fi
-        fi
+    if [ -n "${OVER_VOLTAGE}" ]; then
+        sed -i '/#over_voltage/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-        # GPU memory
+    fi
-        if [ -n "${GPU_MEM}" ]; then
-                sed -i '/#gpu_mem=/ c\gpu_mem=${GPU_MEM}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    # GPU memory
-        fi
+    if [ -n "${GPU_MEM}" ]; then
-        if [ -n "${GPU_MEM_256}" ]; then
+        sed -i '/#gpu_mem=/ c\gpu_mem=${GPU_MEM}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-                sed -i '/#gpu_mem_256/ c\gpu_mem_256=${GPU_MEM_256}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    fi
-        fi
+    if [ -n "${GPU_MEM_256}" ]; then
-        if [ -n "${GPU_MEM_512}" ]; then
+        sed -i '/#gpu_mem_256/ c\gpu_mem_256=${GPU_MEM_256}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-                sed -i '/#gpu_mem_512/ c\gpu_mem_512=${GPU_MEM_512}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    fi
-        fi
+    if [ -n "${GPU_MEM_512}" ]; then
+        sed -i '/#gpu_mem_512/ c\gpu_mem_512=${GPU_MEM_512}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
-        # Video camera support
+    fi
-        if [ -n "${VIDEO_CAMERA}" ]; then
-                echo "# Enable video camera" >>${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    # Video camera support
-                echo "start_x=1" >>${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt
+    if [ -n "${VIDEO_CAMERA}" ]; then
-        fi
+        echo "# Enable video camera" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+        echo "start_x=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
+    fi
 }
+addtask deploy before do_package after do_install
+do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

diff --git a/recipes-bcm/bootfiles/rpi-config_git.bb b/recipes-bcm/bootfiles/rpi-config_git.bb index 66a8fa8..9b5c1e6 100644 --- a/recipes-bcm/bootfiles/rpi-config_git.bb +++ b/recipes-bcm/bootfiles/rpi-config_git.bb
@@ -15,49 +15,54 @@ S = "${WORKDIR}/git"
15		15
16	PR = "r4"	16	PR = "r4"
17		17
18	addtask deploy before do_package after do_install	18	inherit deploy
19		19
20	do_deploy() {	20	do_deploy() {
21	install -d ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles	21	install -d ${DEPLOYDIR}/bcm2835-bootfiles
22	cp config.txt ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/	22
23	if [ -n "${KEY_DECODE_MPG2}" ]; then	23	cp ${S}/config.txt ${DEPLOYDIR}/bcm2835-bootfiles/
24	sed -i '/#decode_MPG2/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	24
25	fi	25	if [ -n "${KEY_DECODE_MPG2}" ]; then
26	if [ -n "${KEY_DECODE_WVC1}" ]; then	26	sed -i '/#decode_MPG2/ c\decode_MPG2=${KEY_DECODE_MPG2}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
27	sed -i '/#decode_WVC1/ c\decode_MVC1=${KEY_DECODE_WVC1}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	27	fi
28	fi	28	if [ -n "${KEY_DECODE_WVC1}" ]; then
29	if [ -n "${DISABLE_OVERSCAN}" ]; then	29	sed -i '/#decode_WVC1/ c\decode_MVC1=${KEY_DECODE_WVC1}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
30	sed -i '/#disable_overscan/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	30	fi
31	fi	31	if [ -n "${DISABLE_OVERSCAN}" ]; then
32	if [ -n "${ARM_FREQ}" ]; then	32	sed -i '/#disable_overscan/ c\disable_overscan=${DISABLE_OVERSCAN}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
33	sed -i '/#arm_freq/ c\arm_freq=${ARM_FREQ}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	33	fi
34	fi	34	if [ -n "${ARM_FREQ}" ]; then
35	if [ -n "${CORE_FREQ}" ]; then	35	sed -i '/#arm_freq/ c\arm_freq=${ARM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
36	sed -i '/#core_freq/ c\core_freq=${CORE_FREQ}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	36	fi
37	fi	37	if [ -n "${CORE_FREQ}" ]; then
38	if [ -n "${SDRAM_FREQ}" ]; then	38	sed -i '/#core_freq/ c\core_freq=${CORE_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
39	sed -i '/#sdram_freq/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	39	fi
40	fi	40	if [ -n "${SDRAM_FREQ}" ]; then
41	if [ -n "${OVER_VOLTAGE}" ]; then	41	sed -i '/#sdram_freq/ c\sdram_freq=${SDRAM_FREQ}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
42	sed -i '/#over_voltage/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	42	fi
43	fi	43	if [ -n "${OVER_VOLTAGE}" ]; then
44		44	sed -i '/#over_voltage/ c\over_voltage=${OVER_VOLTAGE}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
45	# GPU memory	45	fi
46	if [ -n "${GPU_MEM}" ]; then	46
47	sed -i '/#gpu_mem=/ c\gpu_mem=${GPU_MEM}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	47	# GPU memory
48	fi	48	if [ -n "${GPU_MEM}" ]; then
49	if [ -n "${GPU_MEM_256}" ]; then	49	sed -i '/#gpu_mem=/ c\gpu_mem=${GPU_MEM}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
50	sed -i '/#gpu_mem_256/ c\gpu_mem_256=${GPU_MEM_256}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	50	fi
51	fi	51	if [ -n "${GPU_MEM_256}" ]; then
52	if [ -n "${GPU_MEM_512}" ]; then	52	sed -i '/#gpu_mem_256/ c\gpu_mem_256=${GPU_MEM_256}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
53	sed -i '/#gpu_mem_512/ c\gpu_mem_512=${GPU_MEM_512}' ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	53	fi
54	fi	54	if [ -n "${GPU_MEM_512}" ]; then
55		55	sed -i '/#gpu_mem_512/ c\gpu_mem_512=${GPU_MEM_512}' ${DEPLOYDIR}/bcm2835-bootfiles/config.txt
56	# Video camera support	56	fi
57	if [ -n "${VIDEO_CAMERA}" ]; then	57
58	echo "# Enable video camera" >>${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	58	# Video camera support
59	echo "start_x=1" >>${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/config.txt	59	if [ -n "${VIDEO_CAMERA}" ]; then
60	fi	60	echo "# Enable video camera" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
		61	echo "start_x=1" >>${DEPLOYDIR}/bcm2835-bootfiles/config.txt
		62	fi
61	}	63	}
62		64
		65	addtask deploy before do_package after do_install
		66	do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles"
		67
63	PACKAGE_ARCH = "${MACHINE_ARCH}"	68	PACKAGE_ARCH = "${MACHINE_ARCH}"