Skip to content

Commit 50921ce

Browse files
Josua-SRJosua-SR
committed
support generating xspi image
1 parent 9d54e06 commit 50921ce

12 files changed

Lines changed: 77 additions & 75 deletions

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ This Layer supports the following images:
8585
| ------------------------- | ------------------------------------------------------------------------------ |
8686
| fsl-image-networking | Typical networking features and basic cli utilities |
8787
| fsl-image-networking-full | Demo of all packages tested by NXP including dpdk, dpdk examples and vpp |
88+
| lx216xa-xspi-image | Boot image for SPI Flash |
8889
8990
### Image Types (wic)
9091

‎conf/machine/include/lx2160a-clearfog-cx.inc‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
# select DTBs
2-
KERNEL_DEVICETREE ?= " \
3-
freescale/fsl-lx2160a-clearfog-cx.dtb \
4-
freescale/fsl-lx2160a-honeycomb.dtb \
5-
"
6-
7-
# install DTBs with freescale/ prefix
8-
IMAGE_BOOT_FILES:append = " \
9-
fsl-lx2160a-clearfog-cx.dtb;freescale/fsl-lx2160a-clearfog-cx.dtb \
10-
fsl-lx2160a-honeycomb.dtb;freescale/fsl-lx2160a-honeycomb.dtb \
11-
"
12-
# HACK: place one sentinel dtb without freescale/ prefix to fix wic image generated extlinux.conf fdtdir path
13-
IMAGE_BOOT_FILES:prepend = " fsl-lx2160a-clearfog-cx.dtb;sentinel.dtb "
14-
151
# select DPL/DPC (config/lx2160a/LX2160A-<MC_FLAVOUR>/<DPL/DPC>)
162
# variable consumed in wks files
173
MC_DPC ?= "clearfog-cx-s1_8-s2_0-dpc.dtb"

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

Lines changed: 1 addition & 1 deletion
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:fsl-lsch3:lx2160a:"
6+
MACHINEOVERRIDES =. "lx2160a-cex6:lx216xa-sr:fsl-lsch3:lx2160a:"
77

88
DTB_LOAD = "0x90000000"
99
UBOOT_ENTRYPOINT = "0x80080000"

‎conf/machine/include/lx2160acex7.inc‎

Lines changed: 1 addition & 1 deletion
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:fsl-lsch3:lx2160a:"
6+
MACHINEOVERRIDES =. "lx2160a-cex7:lx216xa-sr:fsl-lsch3:lx2160a:"
77

88
DTB_LOAD = "0x90000000"
99
UBOOT_ENTRYPOINT = "0x80080000"

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

Lines changed: 1 addition & 1 deletion
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:fsl-lsch3:lx2162a:"
6+
MACHINEOVERRIDES =. "lx2162a-som:lx216xa-sr:fsl-lsch3:lx2162a:"
77

88
DTB_LOAD = "0x90000000"
99
UBOOT_ENTRYPOINT = "0x80080000"

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

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,33 @@ IMAGE_BOOT_FILES = " Image.gz;Image "
1313

1414
KERNEL_DEFCONFIG ?= "defconfig"
1515

16+
# select DTBs
17+
KERNEL_DEVICETREE ?= " \
18+
freescale/fsl-lx2160a-cex6-evb.dtb \
19+
freescale/fsl-lx2160a-clearfog-cx.dtb \
20+
freescale/fsl-lx2160a-half-twins.dtb \
21+
freescale/fsl-lx2160a-honeycomb.dtb \
22+
freescale/fsl-lx2162a-clearfog.dtb \
23+
"
24+
25+
# install DTBs with freescale/ prefix
26+
IMAGE_BOOT_FILES:append = " \
27+
fsl-lx2160a-cex6-evb.dtb;freescale/fsl-lx2160a-cex6-evb.dtb \
28+
fsl-lx2160a-clearfog-cx.dtb;freescale/fsl-lx2160a-clearfog-cx.dtb \
29+
fsl-lx2160a-half-twins.dtb;freescale/fsl-lx2160a-half-twins.dtb \
30+
fsl-lx2160a-honeycomb.dtb;freescale/fsl-lx2160a-honeycomb.dtb \
31+
fsl-lx2162a-clearfog.dtb;freescale/fsl-lx2162a-clearfog.dtb \
32+
"
33+
# HACK: place one sentinel dtb without freescale/ prefix to fix wic image generated extlinux.conf fdtdir path
34+
IMAGE_BOOT_FILES:prepend = " fsl-lx2160a-cex6-evb.dtb;sentinel.dtb "
35+
1636
SERIAL_CONSOLES:qoriq-arm64 = "115200;ttyAMA0"
1737
SERIAL_CONSOLES ?= "115200;ttyAMA0"
1838
SERIAL_CONSOLES_CHECK ?= "${SERIAL_CONSOLES}"
1939

2040
USE_VT = "0"
2141

22-
MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " udev-solidrun "
42+
MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append = " udev-solidrun-lx2xxx "
2343

2444
# generate sd-bootable wic image
2545
WKS_FILE = "lx2160a-bootimg-mmc.wks.in"

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@
66
require conf/machine/include/lx216xa-solidrun.inc
77
require conf/machine/include/lx2160acex6-rev2.inc
88

9-
# select DTBs
10-
KERNEL_DEVICETREE ?= " \
11-
freescale/fsl-lx2160a-cex6-evb.dtb \
12-
"
13-
14-
# install DTBs with freescale/ prefix
15-
IMAGE_BOOT_FILES:append = " \
16-
fsl-lx2160a-cex6-evb.dtb;freescale/fsl-lx2160a-cex6-evb.dtb \
17-
"
18-
# HACK: place one sentinel dtb without freescale/ prefix to fix wic image generated extlinux.conf fdtdir path
19-
IMAGE_BOOT_FILES:prepend = " fsl-lx2160a-cex6-evb.dtb;sentinel.dtb "
20-
219
# select DPL/DPC (config/lx2160a/LX2160A-<MC_FLAVOUR>/<DPL/DPC>)
2210
# variable consumed in wks files
2311
MC_DPC ?= "evb-s1_3-s2_0-dpc.dtb"

‎conf/machine/lx2160a-rev2-half-twins.conf‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,6 @@ LX2160A_DDR_SPEED ?= "3200"
88
require conf/machine/include/lx216xa-solidrun.inc
99
require conf/machine/include/lx2160acex7-rev2.inc
1010

11-
# select DTBs
12-
KERNEL_DEVICETREE ?= " \
13-
freescale/fsl-lx2160a-half-twins.dtb \
14-
"
15-
16-
# install DTBs with freescale/ prefix
17-
IMAGE_BOOT_FILES:append = " \
18-
fsl-lx2160a-half-twins.dtb;freescale/fsl-lx2160a-half-twins.dtb \
19-
"
20-
# HACK: place one sentinel dtb without freescale/ prefix to fix wic image generated extlinux.conf fdtdir path
21-
IMAGE_BOOT_FILES:prepend = " fsl-lx2160a-half-twins.dtb;sentinel.dtb "
22-
IMAGE_BOOT_FILES:remove = "${KERNEL_DEVICETREE}"
23-
2411
# select DPL/DPC (config/lx2160a/LX2160A-<MC_FLAVOUR>/<DPL/DPC>)
2512
# variable consumed in wks files
2613
MC_DPC ?= "twins-s1_8-s2_9-dpc.dtb"

‎conf/machine/lx2162a-rev2-clearfog.conf‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@
66
require conf/machine/include/lx216xa-solidrun.inc
77
require conf/machine/include/lx2162asom-rev2.inc
88

9-
# select DTBs
10-
KERNEL_DEVICETREE ?= " \
11-
freescale/fsl-lx2162a-clearfog.dtb \
12-
"
13-
14-
# install DTBs with freescale/ prefix
15-
IMAGE_BOOT_FILES:append = " \
16-
fsl-lx2162a-clearfog.dtb;freescale/fsl-lx2162a-clearfog.dtb \
17-
"
18-
# HACK: place one sentinel dtb without freescale/ prefix to fix wic image generated extlinux.conf fdtdir path
19-
IMAGE_BOOT_FILES:prepend = " fsl-lx2162a-clearfog.dtb;sentinel.dtb "
20-
219
# select DPL/DPC (config/lx2162a/LX2162A-<MC_FLAVOUR>/<DPL/DPC>)
2210
# variable consumed in wks files
2311
MC_DPC ?= "clearfog-s1_3-s2_9-dpc.dtb"

‎conf/machine/lx216xa-solidrun.conf‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,5 @@
55

66
require conf/machine/include/lx216xa-solidrun.inc
77

8-
# select DTBs
9-
KERNEL_DEVICETREE ?= " \
10-
freescale/fsl-lx2160a-cex6-evb.dtb \
11-
freescale/fsl-lx2160a-clearfog-cx.dtb \
12-
freescale/fsl-lx2160a-half-twins.dtb \
13-
freescale/fsl-lx2160a-honeycomb.dtb \
14-
freescale/fsl-lx2162a-clearfog.dtb \
15-
"
16-
17-
# install DTBs with freescale/ prefix
18-
IMAGE_BOOT_FILES:append = " \
19-
fsl-lx2160a-cex6-evb.dtb;freescale/fsl-lx2160a-cex6-evb.dtb \
20-
fsl-lx2160a-clearfog-cx.dtb;freescale/fsl-lx2160a-clearfog-cx.dtb \
21-
fsl-lx2160a-half-twins.dtb;freescale/fsl-lx2160a-half-twins.dtb \
22-
fsl-lx2160a-honeycomb.dtb;freescale/fsl-lx2160a-honeycomb.dtb \
23-
fsl-lx2162a-clearfog.dtb;freescale/fsl-lx2162a-clearfog.dtb \
24-
"
25-
# HACK: place one sentinel dtb without freescale/ prefix to fix wic image generated extlinux.conf fdtdir path
26-
IMAGE_BOOT_FILES:prepend = " fsl-lx2160a-cex6-evb.dtb;sentinel.dtb "
27-
288
# generate rootfs / kernel only wic image
299
WKS_FILE ?= "lx2160a-rootimg.wks.in"

0 commit comments

Comments
 (0)