Eric Lee / meta-embedian-bsp

Download as
Browse Code ยป

Commit 6879a8dff50f77b8da6ccbad44cb0ad19efa340f

Authored by Eric Lee
1 parent 2f3a3fd5f9
Exists in kirtstone-5.15.71_2.2.0

remove unused file

Showing 1 changed file with 0 additions and 176 deletions Inline Diff

1 diff --git a/conf/machine/smarcfimx6dl1g.conf b/conf/machine/smarcfimx6dl1g.conf File was deleted
2 index e4ede70..abec2a5 100644
3 --- a/conf/machine/smarcfimx6dl1g.conf
4 +++ b/conf/machine/smarcfimx6dl1g.conf
5 @@ -48,6 +48,9 @@ MACHINE_EXTRA_RRECOMMENDS += " \
6 nodejs \
7 networkmanager \
8 android-tools \
9 + v4l-utils \
10 + gstreamer1.0-plugins-imx \
11 + imx-gst1.0-plugin \
12 "
13
14 IMAGE_INSTALL:append = " \
15 diff --git a/conf/machine/smarcfimx6q1g.conf b/conf/machine/smarcfimx6q1g.conf
16 index 8b7a6d4..2873b4e 100644
17 --- a/conf/machine/smarcfimx6q1g.conf
18 +++ b/conf/machine/smarcfimx6q1g.conf
19 @@ -48,6 +48,9 @@ MACHINE_EXTRA_RRECOMMENDS += " \
20 nodejs \
21 networkmanager \
22 android-tools \
23 + v4l-utils \
24 + gstreamer1.0-plugins-imx \
25 + imx-gst1.0-plugin \
26 "
27
28 IMAGE_INSTALL:append = " \
29 diff --git a/conf/machine/smarcfimx6q2g.conf b/conf/machine/smarcfimx6q2g.conf
30 index aaa2598..3befea4 100644
31 --- a/conf/machine/smarcfimx6q2g.conf
32 +++ b/conf/machine/smarcfimx6q2g.conf
33 @@ -48,6 +48,9 @@ MACHINE_EXTRA_RRECOMMENDS += " \
34 nodejs \
35 networkmanager \
36 android-tools \
37 + v4l-utils \
38 + gstreamer1.0-plugins-imx \
39 + imx-gst1.0-plugin \
40 "
41
42 IMAGE_INSTALL:append = " \
43 @@ -59,6 +62,13 @@ IMAGE_INSTALL:append = " \
44 ppp \
45 usb-modeswitch-data \
46 usb-modeswitch \
47 + packagegroup-core-buildessential \
48 + qtbase-dev \
49 + qtbase-tools \
50 + qtvirtualkeyboard \
51 + flac \
52 + python3 \
53 + python3-pip \
54 "
55
56 IMAGE_FSTYPES = "tar.bz2"
57 diff --git a/conf/machine/smarcfimx6qp1g.conf b/conf/machine/smarcfimx6qp1g.conf
58 index 546816d..8218fe2 100644
59 --- a/conf/machine/smarcfimx6qp1g.conf
60 +++ b/conf/machine/smarcfimx6qp1g.conf
61 @@ -48,6 +48,9 @@ MACHINE_EXTRA_RRECOMMENDS += " \
62 nodejs \
63 networkmanager \
64 android-tools \
65 + v4l-utils \
66 + gstreamer1.0-plugins-imx \
67 + imx-gst1.0-plugin \
68 "
69
70 IMAGE_INSTALL:append = " \
71 diff --git a/conf/machine/smarcfimx6qp2g.conf b/conf/machine/smarcfimx6qp2g.conf
72 index 00d2704..9b81cf2 100644
73 --- a/conf/machine/smarcfimx6qp2g.conf
74 +++ b/conf/machine/smarcfimx6qp2g.conf
75 @@ -48,6 +48,9 @@ MACHINE_EXTRA_RRECOMMENDS += " \
76 nodejs \
77 networkmanager \
78 android-tools \
79 + v4l-utils \
80 + gstreamer1.0-plugins-imx \
81 + imx-gst1.0-plugin \
82 "
83
84 IMAGE_INSTALL:append = " \
85 diff --git a/conf/machine/smarcfimx6solo.conf b/conf/machine/smarcfimx6solo.conf
86 index 39a39b5..f7960b1 100644
87 --- a/conf/machine/smarcfimx6solo.conf
88 +++ b/conf/machine/smarcfimx6solo.conf
89 @@ -48,6 +48,9 @@ MACHINE_EXTRA_RRECOMMENDS += " \
90 nodejs \
91 networkmanager \
92 android-tools \
93 + v4l-utils \
94 + gstreamer1.0-plugins-imx \
95 + imx-gst1.0-plugin \
96 "
97
98 IMAGE_INSTALL:append = " \
99 diff --git a/recipes-kernel/linux/linux-imx.bb b/recipes-kernel/linux/linux-imx.bb
100 index f45ffaf..80b264f 100644
101 --- a/recipes-kernel/linux/linux-imx.bb
102 +++ b/recipes-kernel/linux/linux-imx.bb
103 @@ -23,7 +23,7 @@ LOCALVERSION = "-1.0.0+yocto"
104 KERNEL_SRC ?= "git://git@git.embedian.com/developer/smarc-fsl-linux-kernel.git;protocol=ssh;branch=${SRCBRANCH}"
105 SRC_URI = "${KERNEL_SRC}"
106
107 -SRCREV = "adf910d81008d0af3ca2e53eec31f3b2579c316a"
108 +SRCREV = "fe5d2c33dc78a79ff1e53b0f83a5b8a44506c38b"
109
110 LINUX_VERSION = "5.15.71"
111
112 diff --git a/scripts/emb_mk_yocto_sdcard/emb-create-yocto-sdcard.sh b/scripts/emb_mk_yocto_sdcard/emb-create-yocto-sdcard.sh
113 index 032fad3..e3b7384 100755
114 --- a/scripts/emb_mk_yocto_sdcard/emb-create-yocto-sdcard.sh
115 +++ b/scripts/emb_mk_yocto_sdcard/emb-create-yocto-sdcard.sh
116 @@ -143,7 +143,7 @@ if [[ $EUID -ne 0 ]] ; then
117 exit 1
118 fi
119
120 -if [["${MACHINE}" != "smarcimx8qm4g" && "${MACHINE}" != "smarcimx8qm8g" && "${MACHINE}" != "smarcimx8mp2g" && "${MACHINE}" != "smarcimx8mp4g" && "${MACHINE}" != "smarcimx8mp6g" && "${MACHINE}" != "pitximx8mp2g" && "${MACHINE}" != "pitximx8mp4g" && "${MACHINE}" != "pitximx8mp6g" && "${MACHINE}" != "smarcimx8mq2g" && "${MACHINE}" != "smarcimx8mq4g" && "${MACHINE}" != "smarcimx8mm2g" && "${MACHINE}" != "smarcimx8mm4g" && "${MACHINE}" != "smarcfimx6qp2g" && "${MACHINE}" != "smarcfimx6qp1g" && "${MACHINE}" != "smarcfimx6q2g" && "${MACHINE}" != "smarcfimx6q1g" && "${MACHINE}" != "smarcfimx6dl1g" && "${MACHINE}" != "smarcfimx6solo" && "${MACHINE}" != "smarcfimx7d2g" && "${MACHINE}" != "smarcfimx7d" && "${MACHINE}" != "smarcfimx7s" ]] ; then
121 +if [[ "${MACHINE}" != "smarcimx8qm4g" && "${MACHINE}" != "smarcimx8qm8g" && "${MACHINE}" != "smarcimx8mp2g" && "${MACHINE}" != "smarcimx8mp4g" && "${MACHINE}" != "smarcimx8mp6g" && "${MACHINE}" != "pitximx8mp2g" && "${MACHINE}" != "pitximx8mp4g" && "${MACHINE}" != "pitximx8mp6g" && "${MACHINE}" != "smarcimx8mq2g" && "${MACHINE}" != "smarcimx8mq4g" && "${MACHINE}" != "smarcimx8mm2g" && "${MACHINE}" != "smarcimx8mm4g" && "${MACHINE}" != "smarcfimx6qp2g" && "${MACHINE}" != "smarcfimx6qp1g" && "${MACHINE}" != "smarcfimx6q2g" && "${MACHINE}" != "smarcfimx6q1g" && "${MACHINE}" != "smarcfimx6dl1g" && "${MACHINE}" != "smarcfimx6solo" && "${MACHINE}" != "smarcfimx7d2g" && "${MACHINE}" != "smarcfimx7d" && "${MACHINE}" != "smarcfimx7s" ]] ; then
122 echo "Unsupported machine!!"
123 exit 1
124 fi
125 @@ -259,9 +259,12 @@ function install_bootloader
126 {
127 echo
128 echo "Installing U-Boot"
129 - if [[ "${MACHINE}" = "smarcimx8qm4g" || "${MACHINE}" = "smarcimx8qm8g" || "${MACHINE}" = "smarcimx8mp2g" || "${MACHINE}" = "smarcimx8mp4g" || "${MACHINE}" = "smarcimx8mp6g" || "${MACHINE}" = "pitximx8mp2g" || "${MACHINE}" = "pitximx8mp4g" || "${MACHINE}" = "pitximx8mp6g" || "${MACHINE}" = "smarcimx8mq2g" || "${MACHINE}" = "smarcimx8mq4g" || "${MACHINE}" = "smarcimx8mm2g" || "${MACHINE}" = "smarcimx8mm4g" ]]; then
130 + if [[ "${MACHINE}" = "smarcimx8mp2g" || "${MACHINE}" = "smarcimx8mp4g" || "${MACHINE}" = "smarcimx8mp6g" || "${MACHINE}" = "pitximx8mp2g" || "${MACHINE}" = "pitximx8mp4g" || "${MACHINE}" = "pitximx8mp6g" || "${MACHINE}" = "smarcimx8mq2g" || "${MACHINE}" = "smarcimx8mq4g" || "${MACHINE}" = "smarcimx8mm2g" || "${MACHINE}" = "smarcimx8mm4g" ]]; then
131 dd if=${YOCTO_IMGS_PATH}/imx-boot-${MACHINE}-sd.bin-flash_evk of=${LPARAM_BLOCK_DEVICE} bs=1K seek=${BOOTLOADER_OFFSET}; sync
132 fi
133 + if [[ "${MACHINE}" = "smarcimx8qm4g" || "${MACHINE}" = "smarcimx8qm8g" ]]; then
134 + dd if=${YOCTO_IMGS_PATH}/imx-boot-${MACHINE}-sd.bin-flash_spl of=${LPARAM_BLOCK_DEVICE} bs=1K seek=${BOOTLOADER_OFFSET}; sync
135 + fi
136 if [[ "${MACHINE}" = "smarcfimx6q1g" || "${MACHINE}" = "smarcfimx6q2g" || "${MACHINE}" = "smarcfimx6qp1g" || "${MACHINE}" = "smarcfimx6qp2g" || "${MACHINE}" = "smarcfimx6dl1g" || "${MACHINE}" = "smarcfimx6solo" || "${MACHINE}" = "smarcfimx7d2g" || "${MACHINE}" = "smarcfimx7d" || "${MACHINE}" = "smarcfimx7s" ]]; then
137 dd if=${YOCTO_IMGS_PATH}/u-boot.imx of=${LPARAM_BLOCK_DEVICE} bs=512 seek=${BOOTLOADER_OFFSET}; sync
138 fi
139 @@ -297,6 +300,9 @@ function install_yocto
140 cp -v ${YOCTO_IMGS_PATH}/imx8mp-smarc${DISPLAY}.dtb ${P1_MOUNT_DIR}/dtbs/imx8mp-smarc.dtb
141 cp -v ${YOCTO_SCRIPTS_PATH}/uEnv_8mp.txt ${P1_MOUNT_DIR}/uEnv.txt
142 elif [[ "${MACHINE}" = "smarcimx8qm4g" || "${MACHINE}" = "smarcimx8qm8g" ]]; then
143 + cp -v ${YOCTO_IMGS_PATH}/dpfw.bin ${P1_MOUNT_DIR}/
144 + cp -v ${YOCTO_IMGS_PATH}/hdmirxfw.bin ${P1_MOUNT_DIR}/
145 + cp -v ${YOCTO_IMGS_PATH}/hdmitxfw.bin ${P1_MOUNT_DIR}/
146 cp -v ${YOCTO_IMGS_PATH}/imx8qm-smarc${DISPLAY}.dtb ${P1_MOUNT_DIR}/dtbs/imx8qm-smarc.dtb
147 cp -v ${YOCTO_SCRIPTS_PATH}/uEnv_8qm.txt ${P1_MOUNT_DIR}/uEnv.txt
148 elif [[ "${MACHINE}" = "pitximx8mp2g" || "${MACHINE}" = "pitximx8mp4g" || "${MACHINE}" = "pitximx8mp6g" ]]; then
149 @@ -379,9 +385,12 @@ function copy_images
150 exit 1
151 fi
152
153 - if [[ "${MACHINE}" = "smarcimx8qm4g" || "${MACHINE}" = "smarcimx8qm8g" || "${MACHINE}" = "smarcimx8mp2g" || "${MACHINE}" = "smarcimx8mp4g" || "${MACHINE}" = "smarcimx8mp6g" || "${MACHINE}" = "pitximx8mp2g" || "${MACHINE}" = "pitximx8mp4g" || "${MACHINE}" = "pitximx8mp6g" || "${MACHINE}" = "smarcimx8mq2g" || "${MACHINE}" = "smarcimx8mq4g" || "${MACHINE}" = "smarcimx8mm2g" || "${MACHINE}" = "smarcimx8mm4g" ]]; then
154 + if [[ "${MACHINE}" = "smarcimx8mp2g" || "${MACHINE}" = "smarcimx8mp4g" || "${MACHINE}" = "smarcimx8mp6g" || "${MACHINE}" = "pitximx8mp2g" || "${MACHINE}" = "pitximx8mp4g" || "${MACHINE}" = "pitximx8mp6g" || "${MACHINE}" = "smarcimx8mq2g" || "${MACHINE}" = "smarcimx8mq4g" || "${MACHINE}" = "smarcimx8mm2g" || "${MACHINE}" = "smarcimx8mm4g" ]]; then
155 cp ${YOCTO_IMGS_PATH}/imx-boot-${MACHINE}-sd.bin-* ${P2_MOUNT_DIR}/opt/images/Yocto
156 (cd ${P2_MOUNT_DIR}/opt/images/Yocto; ln -fs imx-boot-${MACHINE}-sd.bin-flash_evk imx-boot-sd.bin)
157 + elif [[ "${MACHINE}" = "smarcimx8qm4g" || "${MACHINE}" = "smarcimx8qm8g" ]]; then
158 + cp ${YOCTO_IMGS_PATH}/imx-boot-${MACHINE}-sd.bin-* ${P2_MOUNT_DIR}/opt/images/Yocto
159 + (cd ${P2_MOUNT_DIR}/opt/images/Yocto; ln -fs imx-boot-${MACHINE}-sd.bin-flash_spl imx-boot-sd.bin)
160 else
161 cp ${YOCTO_IMGS_PATH}/u-boot.imx ${P2_MOUNT_DIR}/opt/images/Yocto/u-boot.imx
162 fi
163 diff --git a/scripts/emb_mk_yocto_sdcard/smarc-imx8qm-create-yocto-emmc.sh b/scripts/emb_mk_yocto_sdcard/smarc-imx8qm-create-yocto-emmc.sh
164 index bef29ef..45ea6f2 100755
165 --- a/scripts/emb_mk_yocto_sdcard/smarc-imx8qm-create-yocto-emmc.sh
166 +++ b/scripts/emb_mk_yocto_sdcard/smarc-imx8qm-create-yocto-emmc.sh
167 @@ -149,6 +149,9 @@ install_kernel_to_emmc()
168 mount /dev/${BLOCK}${PART}${BOOTPART} ${MOUNTDIR}
169 mkdir -p ${MOUNTDIR}/dtbs/
170 cp -v ${IMGS_PATH}/${KERNEL_IMAGE} ${MOUNTDIR}
171 + cp -v ${IMGS_PATH}/dpfw.bin ${MOUNTDIR}
172 + cp -v ${IMGS_PATH}/hdmirxfw.bin ${MOUNTDIR}
173 + cp -v ${IMGS_PATH}/hdmitxfw.bin ${MOUNTDIR}
174 cp -v ${IMGS_PATH}/${DTB_PREFIX}${DISPLAY}.dtb ${MOUNTDIR}/dtbs/imx8qm-smarc.dtb
175 cp -v ${IMGS_PATH}/uEnv.txt ${MOUNTDIR}
176
177 1 diff --git a/conf/machine/smarcfimx6dl1g.conf b/conf/machine/smarcfimx6dl1g.conf