Skip to content

Commit 9d54e06

Browse files
Josua-SRJosua-SR
committed
fix build for all rev2 boards
1 parent 2a7df19 commit 9d54e06

27 files changed

Lines changed: 248 additions & 88 deletions

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ This Layer supports the following images:
9191
This layer can generate a range of image types by `WKS_FILE` in local.conf:
9292
9393
- `lx2160a-bootimg-mmc.wks.in` (default): Bootloader & Kernel & RootFS, for SD or eMMC.
94-
- `lx2160a-bootimg-xspi.wks.in`: Bootloader only, for SPI Flash.
9594
- `lx2160a-rootimg.wks.in`: Kernel & RootFS only, for any block storage.
9695
9796
### DDR Clock

‎conf/machine/include/lx2160acex6-rev2.inc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#@SOC: LSCH3
44
#@DESCRIPTION: Machine configuration for SolidRun Internal LX2160A Rev 2.0 COM-Express Type 6 Module
55

6-
MACHINEOVERRIDES =. "lx2160a-cex6:"
6+
MACHINEOVERRIDES =. "lx2160a-cex6:fsl-lsch3:lx2160a:"
77

88
DTB_LOAD = "0x90000000"
99
UBOOT_ENTRYPOINT = "0x80080000"
@@ -28,6 +28,3 @@ MC_FLAVOUR ?= "CEX6"
2828
# select rev2 rcw
2929
RCW_FOLDER ?= "lx2160acex6_rev2"
3030
RCW_BOARDS ?= "lx2160acex6_rev2"
31-
32-
# generate sd-bootable wic image
33-
WKS_FILE ?= "lx2160a-bootimg-mmc.wks.in"

‎conf/machine/include/lx2160acex7.inc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#@SOC: LSCH3
44
#@DESCRIPTION: Machine configuration for SolidRun LX2160A Rev 1.0 COM-Express Type 7 Module
55

6-
MACHINEOVERRIDES =. "lx2160a-cex7:"
6+
MACHINEOVERRIDES =. "lx2160a-cex7:fsl-lsch3:lx2160a:"
77

88
DTB_LOAD = "0x90000000"
99
UBOOT_ENTRYPOINT = "0x80080000"
@@ -27,6 +27,3 @@ MC_FLAVOUR ?= "CEX7"
2727

2828
RCW_FOLDER ?= "lx2160acex7"
2929
RCW_BOARDS ?= "lx2160acex7 lx2160acex7_rev2"
30-
31-
# generate sd-bootable wic image
32-
WKS_FILE ?= "lx2160a-bootimg-mmc.wks.in"

‎conf/machine/include/lx2162asom-rev2.inc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#@SOC: LSCH3
44
#@DESCRIPTION: Machine configuration for SolidRun LX2162A Rev 2.0 System on Module
55

6-
MACHINEOVERRIDES =. "lx2162a-som:"
6+
MACHINEOVERRIDES =. "lx2162a-som:fsl-lsch3:lx2162a:"
77

88
DTB_LOAD = "0x90000000"
99
UBOOT_ENTRYPOINT = "0x80080000"
@@ -28,6 +28,3 @@ MC_FLAVOUR ?= "SOM"
2828
# select rev2 rcw
2929
RCW_FOLDER ?= "lx2162asom_rev2"
3030
RCW_BOARDS ?= "lx2162asom_rev2"
31-
32-
# generate sd-bootable wic image
33-
WKS_FILE ?= "lx2160a-bootimg-mmc.wks.in"

‎conf/machine/include/lx216xa-solidrun.inc‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,28 @@ require conf/machine/include/qoriq-arm64.inc
22
DEFAULTTUNE ?= "cortexa72-crypto"
33
require conf/machine/include/arm/armv8a/tune-cortexa72.inc
44

5-
MACHINEOVERRIDES =. "fsl-lsch3:lx2160a:"
6-
75
MACHINE_FEATURES:append = " optee "
86

97
KERNEL_CLASSES = " kernel-fitimage "
10-
KERNEL_IMAGETYPES = "fitImage"
8+
KERNEL_IMAGETYPES = "fitImage Image.gz"
9+
10+
# install Image.gz to "Image" filename because wic image extlinux.conf generator does not recognise Image.gz.
11+
# U-Boot decompresses it fine regardless
12+
IMAGE_BOOT_FILES = " Image.gz;Image "
1113

1214
KERNEL_DEFCONFIG ?= "defconfig"
1315

16+
SERIAL_CONSOLES:qoriq-arm64 = "115200;ttyAMA0"
1417
SERIAL_CONSOLES ?= "115200;ttyAMA0"
1518
SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
1619

1720
USE_VT = "0"
21+
22+
MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " udev-solidrun "
23+
24+
# generate sd-bootable wic image
25+
WKS_FILE = "lx2160a-bootimg-mmc.wks.in"
26+
WIC_CREATE_EXTRA_ARGS:remove = "--no-fstab-update"
27+
28+
# generate kernel image with appended initramfs
29+
INITRAMFS_IMAGE_BUNDLE = "1"

‎conf/machine/lx2160a-rev2-cex6-evb.conf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@ MC_DPL ?= "evb-s1_3-s2_0-dpl.dtb"
2626
# select RCW
2727
BOOTTYPE ?= "auto"
2828
RCWAUTO ?= "evb/rcw_${LX2160A_CPU_SPEED}_${LX2160A_BUS_SPEED}_${LX2160A_DDR_SPEED}_3_3_2_auto"
29+
30+
# configure U-Boot
31+
UBOOT_FDT ?= "fsl-lx2160a-cex7"
32+
UBOOT_FDT_FILE ?= "freescale/fsl-lx2160a-cex6-evb.dtb"

‎conf/machine/lx216xa-solidrun.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ require conf/machine/include/lx216xa-solidrun.inc
77

88
# select DTBs
99
KERNEL_DEVICETREE ?= " \
10-
freescale/fsl-lx2160a-cex6-evb.dtb
10+
freescale/fsl-lx2160a-cex6-evb.dtb \
1111
freescale/fsl-lx2160a-clearfog-cx.dtb \
1212
freescale/fsl-lx2160a-half-twins.dtb \
1313
freescale/fsl-lx2160a-honeycomb.dtb \
14-
freescale/fsl-lx2162a-clearfog.dtb
14+
freescale/fsl-lx2162a-clearfog.dtb \
1515
"
1616

1717
# install DTBs with freescale/ prefix

‎ls-6.6.52-2.2.0.xml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<manifest>
3+
4+
<remote name="yocto" fetch="https://git.yoctoproject.org"/>
5+
<remote name="oe" fetch="https://github.com/openembedded"/>
6+
<remote name="kraj" fetch="https://github.com/kraj"/>
7+
8+
<remote name="community" fetch="https://github.com/Freescale"/>
9+
<remote name="ossystems" fetch="https://github.com/OSSystems"/>
10+
11+
<remote name="nxp-qoriq" fetch="https://github.com/nxp-qoriq"/>
12+
13+
<project name="meta-arm" remote="yocto" path="sources/meta-arm" revision="950a4afce46a359def2958bd9ae33fc08ff9bb0d" upstream="scarthgap"/>
14+
<project name="meta-browser" remote="ossystems" path="sources/meta-browser" revision="dc31889c0899971def535dc1c040edf18bc16691"/>
15+
<project name="meta-clang" remote="kraj" path="sources/meta-clang" revision="2b7433611d80f6d0ee1b04156fa91fc73d3c2665" upstream="scarthgap"/>
16+
<project name="meta-cloud-services" remote="yocto" path="sources/meta-cloud-services" revision="61d37af7f412aa1ecacdf584faf0fba300f7d58e" upstream="scarthgap"/>
17+
18+
<project name="meta-freescale" remote="community" path="sources/meta-freescale" revision="0627128b341cfb2bef7a0832ce8cac0ce1127f13" upstream="scarthgap"/>
19+
<project name="meta-freescale-distro" remote="community" path="sources/meta-freescale-distro" revision="b9d6a5d9931922558046d230c1f5f4ef6ee72345" upstream="scarthgap"/>
20+
21+
<project name="meta-security" remote="yocto" path="sources/meta-security" revision="459d837338ca230254baa2994f870bf6eb9d0139" upstream="scarthgap"/>
22+
<project name="meta-selinux" remote="yocto" path="sources/meta-selinux" revision="3aff015697fa056b4af83b1c9ba44eca346a8a37" upstream="scarthgap"/>
23+
<project name="meta-virtualization" remote="yocto" path="sources/meta-virtualization" revision="6f3c1d8f90947408a6587be222fec575a1ca5195" upstream="scarthgap"/>
24+
<project name="poky" remote="yocto" path="sources/poky" revision="200d12b6a58ad961d60a7774ca0f7a9d29498724" upstream="scarthgap"/>
25+
<project name="meta-openembedded" remote="oe" path="sources/meta-openembedded" revision="72018ca1b1a471226917e8246e8bbf9a374ccf97" upstream="scarthgap"/>
26+
27+
<project name="meta-qoriq" remote="nxp-qoriq" path="sources/meta-qoriq" revision="refs/tags/lf-6.6.52-2.2.0" upstream="scarthgap">
28+
<copyfile dest="setup-env" src="tools/setup-env"/>
29+
</project>
30+
31+
</manifest>

‎recipes-core/udev/files/99-leds-lx2160a-clearfog-twins.rules‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# LX2160A Twins Rules
2+
PROGRAM!="/bin/sh -c 'grep -Fq solidrun,clearfog-twins /sys/firmware/devicetree/base/compatible 2>/dev/null'", GOTO="lx2160a_clearfog_twins_end"
3+
# SFP Connector LED Configuration:
4+
# Linux sets netdev trigger automatically from device-tree, but not the actual netdev source device (netdev name) and function.
5+
# Configure leds for showing link-status and match netdev names based on dpmac node.
6+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@3", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c1-at/device_name && echo 1 > /sys/class/leds/led-c1-at/link'"
7+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@4", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c1-bt/device_name && echo 1 > /sys/class/leds/led-c1-bt/link'"
8+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@5", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-ht-c3-bt/device_name && echo 1 > /sys/class/leds/led-ht-c3-bt/link'"
9+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@6", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-ht-c3-at/device_name && echo 1 > /sys/class/leds/led-ht-c3-at/link'"
10+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@7", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c2-at/device_name && echo 1 > /sys/class/leds/led-c2-at/link'"
11+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@8", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c2-bt/device_name && echo 1 > /sys/class/leds/led-c2-bt/link'"
12+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@9", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c3-at/device_name && echo 1 > /sys/class/leds/led-c3-at/link'"
13+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@a", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c3-bt/device_name && echo 1 > /sys/class/leds/led-c3-bt/link'"
14+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@b", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-ht-c3-ab/device_name && echo 1 > /sys/class/leds/led-ht-c3-ab/link'"
15+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@c", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c1-ab/device_name && echo 1 > /sys/class/leds/led-c1-ab/link'"
16+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@d", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c3-ab/device_name && echo 1 > /sys/class/leds/led-c3-ab/link'"
17+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@e", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c3-bb/device_name && echo 1 > /sys/class/leds/led-c3-bb/link'"
18+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@f", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-ht-c3-bb/device_name && echo 1 > /sys/class/leds/led-ht-c3-bb/link'"
19+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@10", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c2-bb/device_name && echo 1 > /sys/class/leds/led-c2-bb/link'"
20+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@11", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c1-bb/device_name && echo 1 > /sys/class/leds/led-c1-bb/link'"
21+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@12", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c2-ab/device_name && echo 1 > /sys/class/leds/led-c2-ab/link'"
22+
23+
KERNELS=="dpmac.3", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c1-at/device_name && echo 1 > /sys/class/leds/led-c1-at/link'"
24+
KERNELS=="dpmac.4", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c1-bt/device_name && echo 1 > /sys/class/leds/led-c1-bt/link'"
25+
KERNELS=="dpmac.5", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-ht-c3-bt/device_name && echo 1 > /sys/class/leds/led-ht-c3-bt/link'"
26+
KERNELS=="dpmac.6", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-ht-c3-at/device_name && echo 1 > /sys/class/leds/led-ht-c3-at/link'"
27+
KERNELS=="dpmac.7", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c2-at/device_name && echo 1 > /sys/class/leds/led-c2-at/link'"
28+
KERNELS=="dpmac.8", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c2-bt/device_name && echo 1 > /sys/class/leds/led-c2-bt/link'"
29+
KERNELS=="dpmac.9", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c3-at/device_name && echo 1 > /sys/class/leds/led-c3-at/link'"
30+
KERNELS=="dpmac.10", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c3-bt/device_name && echo 1 > /sys/class/leds/led-c3-bt/link'"
31+
KERNELS=="dpmac.11", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-ht-c3-ab/device_name && echo 1 > /sys/class/leds/led-ht-c3-ab/link'"
32+
KERNELS=="dpmac.12", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c1-ab/device_name && echo 1 > /sys/class/leds/led-c1-ab/link'"
33+
KERNELS=="dpmac.13", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c3-ab/device_name && echo 1 > /sys/class/leds/led-c3-ab/link'"
34+
KERNELS=="dpmac.14", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c3-bb/device_name && echo 1 > /sys/class/leds/led-c3-bb/link'"
35+
KERNELS=="dpmac.15", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-ht-c3-bb/device_name && echo 1 > /sys/class/leds/led-ht-c3-bb/link'"
36+
KERNELS=="dpmac.16", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c2-bb/device_name && echo 1 > /sys/class/leds/led-c2-bb/link'"
37+
KERNELS=="dpmac.17", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c1-bb/device_name && echo 1 > /sys/class/leds/led-c1-bb/link'"
38+
KERNELS=="dpmac.18", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-c2-ab/device_name && echo 1 > /sys/class/leds/led-c2-ab/link'"
39+
LABEL="lx2160a_clearfog_twins_end"

‎recipes-core/udev/files/99-leds-lx2162a-clearfog.rules‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# LX2162A Clearfog Rules
2+
PROGRAM!="/bin/sh -c 'grep -Fq solidrun,lx2162a-clearfog /sys/firmware/devicetree/base/compatible 2>/dev/null'", GOTO="lx2162a_clearfog_end"
3+
# SFP Connector LED Configuration:
4+
# Linux sets netdev trigger automatically from device-tree, but not the actual netdev source device (netdev name) and function.
5+
# Configure leds for showing link-status and match netdev names based on dpmac node.
6+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@3", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-sfp-at/device_name && echo 1 > /sys/class/leds/led-sfp-at/link'"
7+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@4", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-sfp-ab/device_name && echo 1 > /sys/class/leds/led-sfp-ab/link'"
8+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@5", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-sfp-bt/device_name && echo 1 > /sys/class/leds/led-sfp-bt/link'"
9+
SUBSYSTEM=="net", ACTION=="add", ENV{OF_FULLNAME}=="/soc/fsl-mc@80c000000/dpmacs/ethernet@6", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-sfp-bb/device_name && echo 1 > /sys/class/leds/led-sfp-bb/link'"
10+
11+
KERNELS=="dpmac.3", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-sfp-at/device_name && echo 1 > /sys/class/leds/led-sfp-at/link'"
12+
KERNELS=="dpmac.4", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-sfp-ab/device_name && echo 1 > /sys/class/leds/led-sfp-ab/link'"
13+
KERNELS=="dpmac.5", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-sfp-bt/device_name && echo 1 > /sys/class/leds/led-sfp-bt/link'"
14+
KERNELS=="dpmac.6", ACTION=="add", RUN+="/bin/sh -c 'echo %k > /sys/class/leds/led-sfp-bb/device_name && echo 1 > /sys/class/leds/led-sfp-bb/link'"
15+
LABEL="lx2162a_clearfog_end"

0 commit comments

Comments
 (0)