From bcfd07485d92e2081151f143f9911ba2d7fe9aac Mon Sep 17 00:00:00 2001 From: Josep Orga Date: Tue, 2 Nov 2021 12:21:38 +0100 Subject: [PATCH] meta-somdevices: Renamed from imx8mm-somdevices-c0p1 to imx8mmsomdevices. Signed-off-by: Josep Orga --- conf/layer.conf | 4 ++-- ...m-somdevices-c0p1.conf => imx8mmsomdevices.conf} | 0 recipes-example/example/example_0.1.bb | 13 ------------- .../linux/files/imx8mm-somdevices-c0p1.dts | 2 +- ...-somdevices-c0p1.dtsi => imx8mm-somdevices.dtsi} | 0 recipes-kernel/linux/linux-imx_%.bbappend | 8 ++++---- 6 files changed, 7 insertions(+), 20 deletions(-) rename conf/machine/{imx8mm-somdevices-c0p1.conf => imx8mmsomdevices.conf} (100%) delete mode 100644 recipes-example/example/example_0.1.bb rename recipes-kernel/linux/files/{imx8mm-somdevices-c0p1.dtsi => imx8mm-somdevices.dtsi} (100%) diff --git a/conf/layer.conf b/conf/layer.conf index 3689f3b..acb3c60 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -10,8 +10,8 @@ BBFILE_PATTERN_somdevices = "^${LAYERDIR}/" BBFILE_PRIORITY_somdevices = "9" LAYERSERIES_COMPAT_somdevices = "hardknott" -UBOOT_DTB_NAME_imx8mm-somdevices-c0p1 = "imx8mm-evk.dtb" -KERNEL_DEVICETREE_imx8mm-somdevices-c0p1 = "freescale/imx8mm-somdevices-c0p1.dtb" +UBOOT_DTB_NAME_imx8mmsomdevices = "imx8mm-evk.dtb" +KERNEL_DEVICETREE_imx8mmsomdevices = "freescale/imx8mm-somdevices-c0p1.dtb" # Avoid multiple runtime providers for u-boot-default-env PREFERRED_RPROVIDER_u-boot-default-env ??= "${IMX_DEFAULT_BOOTLOADER}" diff --git a/conf/machine/imx8mm-somdevices-c0p1.conf b/conf/machine/imx8mmsomdevices.conf similarity index 100% rename from conf/machine/imx8mm-somdevices-c0p1.conf rename to conf/machine/imx8mmsomdevices.conf diff --git a/recipes-example/example/example_0.1.bb b/recipes-example/example/example_0.1.bb deleted file mode 100644 index facaae3..0000000 --- a/recipes-example/example/example_0.1.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "bitbake-layers recipe" -DESCRIPTION = "Recipe created by bitbake-layers" -LICENSE = "MIT" - -python do_display_banner() { - bb.plain("***********************************************"); - bb.plain("* *"); - bb.plain("* Example recipe created by bitbake-layers *"); - bb.plain("* *"); - bb.plain("***********************************************"); -} - -addtask display_banner before do_build diff --git a/recipes-kernel/linux/files/imx8mm-somdevices-c0p1.dts b/recipes-kernel/linux/files/imx8mm-somdevices-c0p1.dts index 98e6d17..8e5559c 100644 --- a/recipes-kernel/linux/files/imx8mm-somdevices-c0p1.dts +++ b/recipes-kernel/linux/files/imx8mm-somdevices-c0p1.dts @@ -6,7 +6,7 @@ /dts-v1/; #include -#include "imx8mm-somdevices-c0p1.dtsi" +#include "imx8mm-somdevices.dtsi" / { model = "FSL i.MX8MM µSMARC SOMDEVICES board"; diff --git a/recipes-kernel/linux/files/imx8mm-somdevices-c0p1.dtsi b/recipes-kernel/linux/files/imx8mm-somdevices.dtsi similarity index 100% rename from recipes-kernel/linux/files/imx8mm-somdevices-c0p1.dtsi rename to recipes-kernel/linux/files/imx8mm-somdevices.dtsi diff --git a/recipes-kernel/linux/linux-imx_%.bbappend b/recipes-kernel/linux/linux-imx_%.bbappend index 1a7e844..2df8dce 100644 --- a/recipes-kernel/linux/linux-imx_%.bbappend +++ b/recipes-kernel/linux/linux-imx_%.bbappend @@ -4,16 +4,16 @@ The kernel is based on the kernel provided by NXP." FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append_imx8mm-somdevices-c0p1 += "\ +SRC_URI_append_imx8mmsomdevices += "\ file://imx8mm-somdevices-c0p1.dts \ - file://imx8mm-somdevices-c0p1.dtsi \ + file://imx8mm-somdevices.dtsi \ file://0001-arm64-Add-SomDevices-Smarc-C0P1-to-Makefile.patch \ file://0002-arm64-Add-sn65dsi83-4-support.patch \ file://0003-arm64-Not-to-show-warning-CAN-interface.patch \ " -do_configure_append_imx8mm-somdevices-c0p1 () { +do_configure_append_imx8mmsomdevices () { # For arm64 bit freescale/NXP devices cp ${WORKDIR}/imx8mm-somdevices-c0p1.dts ${S}/arch/arm64/boot/dts/freescale - cp ${WORKDIR}/imx8mm-somdevices-c0p1.dtsi ${S}/arch/arm64/boot/dts/freescale + cp ${WORKDIR}/imx8mm-somdevices.dtsi ${S}/arch/arm64/boot/dts/freescale } -- 2.17.1