From 4c0a25bcf26c96bde8ab2572b4ca7d1c30f69a63 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 5 Jul 2022 11:09:41 -0400 Subject: Machine cleanup for Nifty Needlefish Remove machine templates and associated files for: - hsdk - dragonboard-410c - dragonboard-820c - nitrogen6x Bug-AGL: SPEC-4402 Signed-off-by: Scott Murray Change-Id: I7ff2665fe5ceef55454905d57e7793d5fcf0ef8a Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27701 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl-bsp/conf/include/agl_dragonboard-410c.inc | 3 -- meta-agl-bsp/conf/include/agl_dragonboard-820c.inc | 2 -- meta-agl-bsp/conf/include/agl_hsdk.inc | 9 ------ meta-agl-bsp/conf/include/agl_nitrogen6x.inc | 1 - .../96boards-tools/96boards-tools_0.12.bb | 32 ---------------------- .../q6v5-pil/files/qcom-q6v5-pil.service | 12 -------- .../meta-qcom/recipes-bsp/q6v5-pil/q6v5-pil.bb | 20 -------------- .../linux/linux-linaro-qcomlt_%.bbappend | 1 - .../recipes-kernel/linux-yocto_%.bbappend | 1 - .../machine/dragonboard-410c/50_bblayers.conf.inc | 2 -- .../machine/dragonboard-410c/50_local.conf.inc | 3 -- .../README_machine_dragonboard-410c.md | 9 ------ .../machine/dragonboard-820c/50_bblayers.conf.inc | 1 - .../machine/dragonboard-820c/50_local.conf.inc | 3 -- .../README_machine_dragonboard-820c.md | 9 ------ templates/machine/hsdk/40_bblayers.conf.inc | 2 -- templates/machine/hsdk/50_local.conf.inc | 2 -- templates/machine/hsdk/README_machine_hsdk.md | 9 ------ templates/machine/nitrogen6x/40_bblayers.conf.inc | 6 ---- templates/machine/nitrogen6x/50_local.conf.inc | 3 -- templates/machine/nitrogen6x/50_setup.sh | 2 -- .../nitrogen6x/README_machine_nitrogen6x.md | 9 ------ 22 files changed, 141 deletions(-) delete mode 100644 meta-agl-bsp/conf/include/agl_dragonboard-410c.inc delete mode 100644 meta-agl-bsp/conf/include/agl_dragonboard-820c.inc delete mode 100644 meta-agl-bsp/conf/include/agl_hsdk.inc delete mode 100644 meta-agl-bsp/conf/include/agl_nitrogen6x.inc delete mode 100644 meta-agl-bsp/meta-qcom/recipes-bsp/96boards-tools/96boards-tools_0.12.bb delete mode 100644 meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/files/qcom-q6v5-pil.service delete mode 100644 meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/q6v5-pil.bb delete mode 100644 meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_%.bbappend delete mode 100644 meta-agl-bsp/meta-synopsys/recipes-kernel/linux-yocto_%.bbappend delete mode 100644 templates/machine/dragonboard-410c/50_bblayers.conf.inc delete mode 100644 templates/machine/dragonboard-410c/50_local.conf.inc delete mode 100644 templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md delete mode 100644 templates/machine/dragonboard-820c/50_bblayers.conf.inc delete mode 100644 templates/machine/dragonboard-820c/50_local.conf.inc delete mode 100644 templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md delete mode 100644 templates/machine/hsdk/40_bblayers.conf.inc delete mode 100644 templates/machine/hsdk/50_local.conf.inc delete mode 100644 templates/machine/hsdk/README_machine_hsdk.md delete mode 100644 templates/machine/nitrogen6x/40_bblayers.conf.inc delete mode 100644 templates/machine/nitrogen6x/50_local.conf.inc delete mode 100644 templates/machine/nitrogen6x/50_setup.sh delete mode 100644 templates/machine/nitrogen6x/README_machine_nitrogen6x.md diff --git a/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc b/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc deleted file mode 100644 index aba92ddf1..000000000 --- a/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc +++ /dev/null @@ -1,3 +0,0 @@ -# Install 96boards-tools for resizing partition -# Add systemd unit file for the qcom_q6v5_pil kernel module -IMAGE_INSTALL:append = " 96boards-tools q6v5-pil" diff --git a/meta-agl-bsp/conf/include/agl_dragonboard-820c.inc b/meta-agl-bsp/conf/include/agl_dragonboard-820c.inc deleted file mode 100644 index 265564c18..000000000 --- a/meta-agl-bsp/conf/include/agl_dragonboard-820c.inc +++ /dev/null @@ -1,2 +0,0 @@ -# Install 96boards-tools for resizing partition -IMAGE_INSTALL:append = " 96boards-tools" diff --git a/meta-agl-bsp/conf/include/agl_hsdk.inc b/meta-agl-bsp/conf/include/agl_hsdk.inc deleted file mode 100644 index b1b0e4a8f..000000000 --- a/meta-agl-bsp/conf/include/agl_hsdk.inc +++ /dev/null @@ -1,9 +0,0 @@ -KERNEL_IMAGETYPE = "uImage" -WKS_FILE = "sdimage-hsdk.wks" -IMAGE_BOOT_FILES = "uImage uboot.env" -IMAGE_INSTALL:append = " kernel-modules" - -# remove incompatible packages from packagegroups -RDEPENDS:packagegroup-agl-core-devel:remove:hsdk = "valgrind gcc-sanitizers" -RDEPENDS:packagegroup-core-tools-profile:remove:hsdk = "systemtap" -RDEPENDS:packagegroup-core-tools-debug:remove:hsdk = "gdbserver" diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc deleted file mode 100644 index cb13de713..000000000 --- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc +++ /dev/null @@ -1 +0,0 @@ -require agl_imx6-common.inc diff --git a/meta-agl-bsp/meta-qcom/recipes-bsp/96boards-tools/96boards-tools_0.12.bb b/meta-agl-bsp/meta-qcom/recipes-bsp/96boards-tools/96boards-tools_0.12.bb deleted file mode 100644 index fdfd3e85f..000000000 --- a/meta-agl-bsp/meta-qcom/recipes-bsp/96boards-tools/96boards-tools_0.12.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Useful bits an pieces to make 96Boards more standard across the board" -HOMEPAGE = "https://github.com/96boards/96boards-tools" -SECTION = "devel" - -LICENSE = "GPL-2.0-or-later" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" - -SRCREV = "ed0f0dbec02c1869a0c4fa0140b4aa5338c9d010" -SRC_URI = "git://github.com/96boards/96boards-tools;branch=master;protocol=https" - -S = "${WORKDIR}/git" - -inherit systemd allarch update-rc.d - -do_install () { - install -d ${D}${sysconfdir}/udev/rules.d - install -m 0755 ${S}/*.rules ${D}${sysconfdir}/udev/rules.d/ - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${S}/resize-disk ${D}${sysconfdir}/init.d/ - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/resize-helper.service ${D}${systemd_unitdir}/system - - install -d ${D}${sbindir} - install -m 0755 ${S}/resize-helper ${D}${sbindir} -} - -INITSCRIPT_NAME = "resize-disk" -INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." - -SYSTEMD_SERVICE:${PN} = "resize-helper.service" -RDEPENDS:${PN} += "e2fsprogs-resize2fs gptfdisk parted util-linux udev" diff --git a/meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/files/qcom-q6v5-pil.service b/meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/files/qcom-q6v5-pil.service deleted file mode 100644 index 3d9cd24bb..000000000 --- a/meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/files/qcom-q6v5-pil.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Qualcomm Hexagon PIL setup -After=rmtfs.service -Requires=rmtfs.service - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/sbin/modprobe -q qcom_q6v5_pil - -[Install] -WantedBy=multi-user.target diff --git a/meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/q6v5-pil.bb b/meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/q6v5-pil.bb deleted file mode 100644 index 14bab2430..000000000 --- a/meta-agl-bsp/meta-qcom/recipes-bsp/q6v5-pil/q6v5-pil.bb +++ /dev/null @@ -1,20 +0,0 @@ -inherit systemd - -SUMMARY = "Systemd unit file for the delay loading Hexagon PIL kernel module" -SECTION = "misc" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI += "file://qcom-q6v5-pil.service" - -do_install() { - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/qcom-q6v5-pil.service ${D}${systemd_unitdir}/system - - # Blacklist qcom_q6v5_pil to prevent modules autoload - # qcom-q6v5-pil.service will do the work after rmtfs done. - install -d ${D}/${sysconfdir}/modprobe.d - echo "blacklist qcom_q6v5_pil" > ${D}/${sysconfdir}/modprobe.d/qcom_q6v5_pil.conf -} - -SYSTEMD_SERVICE:${PN} = "qcom-q6v5-pil.service" diff --git a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_%.bbappend b/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_%.bbappend deleted file mode 100644 index b60201986..000000000 --- a/meta-agl-bsp/meta-qcom/recipes-kernel/linux/linux-linaro-qcomlt_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-kernel/linux/linux-agl-config.inc diff --git a/meta-agl-bsp/meta-synopsys/recipes-kernel/linux-yocto_%.bbappend b/meta-agl-bsp/meta-synopsys/recipes-kernel/linux-yocto_%.bbappend deleted file mode 100644 index d10ca3517..000000000 --- a/meta-agl-bsp/meta-synopsys/recipes-kernel/linux-yocto_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-kernel/linux/linux-yocto-agl.inc diff --git a/templates/machine/dragonboard-410c/50_bblayers.conf.inc b/templates/machine/dragonboard-410c/50_bblayers.conf.inc deleted file mode 100644 index 41fe36719..000000000 --- a/templates/machine/dragonboard-410c/50_bblayers.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-qcom" -BBMASK += "bsp/meta-qcom/openembedded-layer/recipes-navigation/gpsd" diff --git a/templates/machine/dragonboard-410c/50_local.conf.inc b/templates/machine/dragonboard-410c/50_local.conf.inc deleted file mode 100644 index f717fd8ee..000000000 --- a/templates/machine/dragonboard-410c/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "dragonboard-410c" -#see meta-agl/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc -require conf/include/agl_dragonboard-410c.inc diff --git a/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md b/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md deleted file mode 100644 index 047e08c28..000000000 --- a/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine dragonboard-410c -authors: Jan-Simon Möller , Kotaro Hashimoto , Stephane Desneux ---- - -### Machine dragonboard-410c - -*Description is missing - please complete file meta-agl/templates/machine/dragonboard-410c/README_machine_dragonboard-410c.md* - diff --git a/templates/machine/dragonboard-820c/50_bblayers.conf.inc b/templates/machine/dragonboard-820c/50_bblayers.conf.inc deleted file mode 100644 index f3b96cbb6..000000000 --- a/templates/machine/dragonboard-820c/50_bblayers.conf.inc +++ /dev/null @@ -1 +0,0 @@ -BBLAYERS =+ "${METADIR}/bsp/meta-qcom" diff --git a/templates/machine/dragonboard-820c/50_local.conf.inc b/templates/machine/dragonboard-820c/50_local.conf.inc deleted file mode 100644 index 1cd53d60c..000000000 --- a/templates/machine/dragonboard-820c/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "dragonboard-820c" -#see meta-agl/meta-agl-bsp/conf/include/agl_dragonboard-410c.inc -require conf/include/agl_dragonboard-820c.inc diff --git a/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md b/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md deleted file mode 100644 index 73d9532c3..000000000 --- a/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine dragonboard-820c -authors: Jan-Simon Möller ---- - -### Machine dragonboard-820c - -*Description is missing - please complete file meta-agl/templates/machine/dragonboard-820c/README_machine_dragonboard-820c.md* - diff --git a/templates/machine/hsdk/40_bblayers.conf.inc b/templates/machine/hsdk/40_bblayers.conf.inc deleted file mode 100644 index e3954fef3..000000000 --- a/templates/machine/hsdk/40_bblayers.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -# Use meta-synopsys layer for ARC HSDK board -BBLAYERS =+ "${METADIR}/bsp/meta-synopsys" diff --git a/templates/machine/hsdk/50_local.conf.inc b/templates/machine/hsdk/50_local.conf.inc deleted file mode 100644 index 61f77435e..000000000 --- a/templates/machine/hsdk/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -MACHINE = "hsdk" -require conf/include/agl_hsdk.inc diff --git a/templates/machine/hsdk/README_machine_hsdk.md b/templates/machine/hsdk/README_machine_hsdk.md deleted file mode 100644 index 30e56d13b..000000000 --- a/templates/machine/hsdk/README_machine_hsdk.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine hsdk -authors: Evgeniy Didin , Jan-Simon Möller ---- - -### Machine hsdk - -*Description is missing - please complete file meta-agl/templates/machine/hsdk/README_machine_hsdk.md* - diff --git a/templates/machine/nitrogen6x/40_bblayers.conf.inc b/templates/machine/nitrogen6x/40_bblayers.conf.inc deleted file mode 100644 index a4323be1a..000000000 --- a/templates/machine/nitrogen6x/40_bblayers.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -# This must be parsed after qt5, etc. layers so that they are correctly -# recognized by meta-freescale/dynamic-layers -BBLAYERS =+ "\ - ${METADIR}/bsp/meta-freescale \ - ${METADIR}/bsp/meta-freescale-3rdparty \ - " diff --git a/templates/machine/nitrogen6x/50_local.conf.inc b/templates/machine/nitrogen6x/50_local.conf.inc deleted file mode 100644 index f8178bbd1..000000000 --- a/templates/machine/nitrogen6x/50_local.conf.inc +++ /dev/null @@ -1,3 +0,0 @@ -MACHINE = "nitrogen6x" -#see meta-agl/meta-agl-bsp/conf/include/agl_nitrogen6x.inc -require conf/include/agl_nitrogen6x.inc diff --git a/templates/machine/nitrogen6x/50_setup.sh b/templates/machine/nitrogen6x/50_setup.sh deleted file mode 100644 index eefd1eb7f..000000000 --- a/templates/machine/nitrogen6x/50_setup.sh +++ /dev/null @@ -1,2 +0,0 @@ -find_and_ack_eula $METADIR/bsp/meta-freescale EULA -export EULA_FLAG_NAME="ACCEPT_FSL_EULA" diff --git a/templates/machine/nitrogen6x/README_machine_nitrogen6x.md b/templates/machine/nitrogen6x/README_machine_nitrogen6x.md deleted file mode 100644 index 9994de052..000000000 --- a/templates/machine/nitrogen6x/README_machine_nitrogen6x.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Machine nitrogen6x -authors: Jan-Simon Möller , Mihail Grigorov , Nathan Illerbrun , Scott Murray ---- - -### Machine nitrogen6x - -*Description is missing - please complete file meta-agl/templates/machine/nitrogen6x/README_machine_nitrogen6x.md* - -- cgit 1.2.3-korg