MIRRORS/meta-freescale-3rdparty
1
0
Fork 0
mirror of https://github.com/Freescale/meta-freescale-3rdparty.git synced 2025-07-19 12:09:01 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rework machines to use wic support

Browse Source 
This rework existing machines to use the wic support. It allows for a
lot of code removal as the image dependencies can be defined in a more
accurate way.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
This commit is contained in:
Otavio Salvador 2017-10-04 18:29:24 -03:00
parent cb8eb56f37
commit 46916bbd74
9 changed files with 37 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/machine/cgtqmx6.conf
View File

@ -15,8 +15,8 @@ UBOOT_MAKE_TARGET = ""
UBOOT_SUFFIX = "img"
SPL_BINARY = "SPL"
UBOOT_CONFIG ??= "cgtqmx6"
UBOOT_CONFIG[cgtqmx6] = "cgtqmx6eval_defconfig"
WKS_FILE = "imx-uboot-spl-bootpart.wks"
# Use linux kernel QMX6
PREFERRED_PROVIDER_virtual/kernel ??= "linux-congatec"

6
conf/machine/cubox-i.conf
View File

@ -23,6 +23,7 @@ UBOOT_CONFIG ??= "sd"
UBOOT_CONFIG[sd] = "mx6cuboxi_defconfig,sdcard"
UENV_FILENAME = "uEnv-${MACHINE}.txt"
SPL_BINARY = "SPL"
WKS_FILES = "imx-uboot-spl.wks"
UBOOT_EXTLINUX = "1"
UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
@ -40,8 +41,3 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
kernel-devicetree \
u-boot-fslc \
"
WKS_FILES ?= "imx-uboot-spl.wks"
WKS_FILE_DEPENDS ?= ""
IMAGE_FSTYPES = "wic.gz"

5
conf/machine/imx6dl-riotboard.conf
View File

@ -22,7 +22,4 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
u-boot-fslc \
"
WKS_FILES ?= "imx-uboot.wks"
WKS_FILE_DEPENDS ?= ""
IMAGE_FSTYPES = "wic.gz"
WKS_FILES = "imx-uboot.wks"

1
conf/machine/imx6qdl-variscite-som.conf
View File

@ -28,6 +28,7 @@ KERNEL_IMAGETYPE = "uImage"
UBOOT_SPL_BUILD = "yes"
UBOOT_MAKE_TARGET = "all"
UBOOT_SUFFIX = "img"
WKS_FILE = "imx-uboot-spl-bootpart.wks"
PREFERRED_PROVIDER_virtual/bootloader = "u-boot-variscite"
PREFERRED_PROVIDER_u-boot = "u-boot-variscite"

22
conf/machine/nitrogen6sx.conf
View File

@ -16,23 +16,17 @@ PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
# Use SPI NOR U-Boot by default
IMAGE_BOOTLOADER ?= ""
# Ensure boot scripts will be available at rootfs time
do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
# wic support
WKS_FILE ?= "sdimage-bootpart.wks"
IMAGE_BOOT_FILES = " \
WKS_FILE = "sdimage-bootpart.wks"
IMAGE_BOOT_FILES_append = " \
6x_bootscript-${MACHINE};6x_bootscript \
${KERNEL_IMAGETYPE} \
${KERNEL_IMAGETYPE}-imx6sx-nitrogen6sx.dtb;imx6sx-nitrogen6sx.dtb \
"
WKS_FILE_DEPENDS ?= ""
# Boot scripts to install
BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
WKS_FILE_DEPENDS = " \
u-boot-script-boundary \
\
e2fsprogs-native \
bmap-tools-native \
"
UBOOT_MACHINE ?= "nitrogen6sx_config"

22
conf/machine/nitrogen6x-lite.conf
View File

@ -16,23 +16,17 @@ PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
# Use SPI NOR U-Boot by default
IMAGE_BOOTLOADER ?= ""
# Ensure boot scripts will be available at rootfs time
do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
# wic support
WKS_FILE ?= "sdimage-bootpart.wks"
IMAGE_BOOT_FILES = " \
WKS_FILE = "sdimage-bootpart.wks"
IMAGE_BOOT_FILES_append = " \
6x_bootscript-${MACHINE};6x_bootscript \
${KERNEL_IMAGETYPE} \
${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb;imx6dl-nit6xlite.dtb \
"
WKS_FILE_DEPENDS ?= ""
# Boot scripts to install
BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
WKS_FILE_DEPENDS = " \
u-boot-script-boundary \
\
e2fsprogs-native \
bmap-tools-native \
"
UBOOT_MACHINE ?= "nit6xlite_config"

25
conf/machine/nitrogen6x.conf
View File

@ -50,26 +50,17 @@ PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
# Use SPI NOR U-Boot by default
IMAGE_BOOTLOADER ?= ""
# Ensure boot scripts will be available at rootfs time
do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
# Boot scripts to install
BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
# wic support
WKS_FILE ?= "sdimage-bootpart.wks"
IMAGE_BOOT_FILES = " \
WKS_FILE = "sdimage-bootpart.wks"
IMAGE_BOOT_FILES_append = " \
6x_bootscript-${MACHINE};6x_bootscript \
${KERNEL_IMAGETYPE} \
${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb;imx6q-sabrelite.dtb \
${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb;imx6q-nitrogen6_max.dtb ${KERNEL_IMAGETYPE}-imx6qp-nitrogen6_max.dtb;imx6qp-nitrogen6_max.dtb \
${KERNEL_IMAGETYPE}-imx6q-nitrogen6x.dtb;imx6q-nitrogen6x.dtb ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6x.dtb;imx6dl-nitrogen6x.dtb \
${KERNEL_IMAGETYPE}-imx6q-nitrogen6_som2.dtb;imx6q-nitrogen6_som2.dtb ${KERNEL_IMAGETYPE}-imx6qp-nitrogen6_som2.dtb;imx6qp-nitrogen6_som2.dtb \
"
WKS_FILE_DEPENDS ?= ""
WKS_FILE_DEPENDS = " \
u-boot-script-boundary \
\
e2fsprogs-native \
bmap-tools-native \
"
UBOOT_MACHINE ?= "nitrogen6q_config"

22
conf/machine/nitrogen7.conf
View File

@ -16,23 +16,17 @@ PREFERRED_PROVIDER_u-boot = "u-boot-boundary"
PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary"
PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc"
# Use SPI NOR U-Boot by default
IMAGE_BOOTLOADER ?= ""
# Ensure boot scripts will be available at rootfs time
do_rootfs[depends] += "u-boot-script-boundary:do_deploy"
# wic support
WKS_FILE ?= "sdimage-bootpart.wks"
IMAGE_BOOT_FILES = " \
WKS_FILE = "sdimage-bootpart.wks"
IMAGE_BOOT_FILES_append = " \
6x_bootscript-${MACHINE};6x_bootscript \
${KERNEL_IMAGETYPE} \
${KERNEL_IMAGETYPE}-imx7d-nitrogen7.dtb;imx7d-nitrogen7.dtb \
"
WKS_FILE_DEPENDS ?= ""
# Boot scripts to install
BOOT_SCRIPTS = "6x_bootscript-${MACHINE}:6x_bootscript"
WKS_FILE_DEPENDS = " \
u-boot-script-boundary \
\
e2fsprogs-native \
bmap-tools-native \
"
UBOOT_MACHINE ?= "nitrogen7_config"

5
conf/machine/wandboard.conf
View File

@ -47,7 +47,4 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
u-boot-fslc \
"
WKS_FILES ?= "imx-uboot-spl.wks"
WKS_FILE_DEPENDS ?= ""
SOC_DEFAULT_IMAGE_FSTYPES = "wic.gz"
WKS_FILES = "imx-uboot-spl.wks"