mirror of
https://github.com/nxp-imx/meta-imx.git
synced 2025-10-22 15:22:15 +02:00
Revert changes inappropriate for 6.12.34
Two commits made on the 6.12.20 release branch are not appropriate for the 6.12.34 release and must be manually removed from the merge. Revert "meta-imx-bsp/layer.conf: Add missing DTB for imx93-14x14-lpddr4x-evk [YOCIMX-8958]" This reverts commitf428525d48
. Revert "psplash: Add EPDC fb0 rules [YOCIMX-9007]" This reverts commit7be5dd7b3b
.
This commit is contained in:
parent
62422f6b90
commit
e3ccf63913
|
@ -365,8 +365,6 @@ MACHINE_FEATURES:append:imx93-11x11-lpddr4x-evk = " rvgpu-emu"
|
|||
|
||||
# Overrides for imx93-14x14-lpddr4x-evk.conf
|
||||
KERNEL_DEVICETREE:append:imx93-14x14-lpddr4x-evk = " \
|
||||
freescale/imx93-14x14-evk-lvds-it6263.dtb \
|
||||
freescale/imx93-14x14-evk-mqs.dtb \
|
||||
freescale/imx93-14x14-evk-8mic-reve.dtb \
|
||||
"
|
||||
MACHINE_FEATURES:append:imx93-14x14-lpddr4x-evk = " rvgpu-emu"
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
[Unit]
|
||||
Description=Start psplash boot splash screen
|
||||
DefaultDependencies=no
|
||||
RequiresMountsFor=/run
|
||||
ConditionFileIsExecutable=/usr/bin/psplash
|
||||
After=dev-%i.device
|
||||
Wants=dev-%i.device
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
ExecCondition=/bin/sh -c '! /usr/sbin/fbset -i -fb /dev/fb0 | grep -q epdc'
|
||||
ExecStart=/usr/bin/psplash
|
||||
RemainAfterExit=yes
|
Loading…
Reference in New Issue
Block a user