From b8062790ab8f102b73a05a5a7a9d80001e2c2f25 Mon Sep 17 00:00:00 2001 From: Vinicius Aquino Date: Mon, 7 Mar 2022 14:47:54 -0300 Subject: [PATCH 1/2] nitrogen8*: Drop useless overrides for WKS_FILE_DEPENDS Signed-off-by: Vinicius Aquino --- conf/machine/nitrogen8m.conf | 2 +- conf/machine/nitrogen8mm.conf | 2 +- conf/machine/nitrogen8mn.conf | 2 +- conf/machine/nitrogen8mp.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/machine/nitrogen8m.conf b/conf/machine/nitrogen8m.conf index 7f17d6d..734b83e 100644 --- a/conf/machine/nitrogen8m.conf +++ b/conf/machine/nitrogen8m.conf @@ -64,7 +64,7 @@ IMAGE_BOOT_FILES:append = " \ # wic support WKS_FILE = "sdimage-bootpart.wks" -WKS_FILE_DEPENDS:mx8 += " \ +WKS_FILE_DEPENDS += " \ u-boot-script-boundary \ e2fsprogs-native \ bmap-tools-native \ diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf index 072a893..d26fd9e 100644 --- a/conf/machine/nitrogen8mm.conf +++ b/conf/machine/nitrogen8mm.conf @@ -69,7 +69,7 @@ IMAGE_BOOT_FILES:append = " \ # wic support WKS_FILE = "sdimage-bootpart.wks" -WKS_FILE_DEPENDS:mx8 += " \ +WKS_FILE_DEPENDS += " \ u-boot-script-boundary \ e2fsprogs-native \ bmap-tools-native \ diff --git a/conf/machine/nitrogen8mn.conf b/conf/machine/nitrogen8mn.conf index b1a571d..c99593a 100644 --- a/conf/machine/nitrogen8mn.conf +++ b/conf/machine/nitrogen8mn.conf @@ -63,7 +63,7 @@ IMAGE_BOOT_FILES:append = " \ # wic support WKS_FILE = "sdimage-bootpart.wks" -WKS_FILE_DEPENDS:mx8 += " \ +WKS_FILE_DEPENDS += " \ u-boot-script-boundary \ e2fsprogs-native \ bmap-tools-native \ diff --git a/conf/machine/nitrogen8mp.conf b/conf/machine/nitrogen8mp.conf index da059ef..9e2434f 100644 --- a/conf/machine/nitrogen8mp.conf +++ b/conf/machine/nitrogen8mp.conf @@ -60,7 +60,7 @@ IMAGE_BOOT_FILES:append = " \ upgrade.scr-${MACHINE};upgrade.scr \ imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ " -WKS_FILE_DEPENDS:mx8 += " \ +WKS_FILE_DEPENDS += " \ u-boot-script-boundary \ e2fsprogs-native \ bmap-tools-native \ From 47d2543f9d0dd80e4a8fb0be023783d05b1468f7 Mon Sep 17 00:00:00 2001 From: Vinicius Aquino Date: Wed, 9 Mar 2022 11:56:09 -0300 Subject: [PATCH 2/2] nitrogen*: Drop duplicated WKS dependencies e2fsprogs-native and bmap-tools-native are already included by imx-base.inc so it can be dropped here. Signed-off-by: Vinicius Aquino --- conf/machine/nitrogen6sx.conf | 7 +------ conf/machine/nitrogen6x-lite.conf | 7 +------ conf/machine/nitrogen6x.conf | 7 +------ conf/machine/nitrogen7.conf | 7 +------ conf/machine/nitrogen8m.conf | 6 +----- conf/machine/nitrogen8mm.conf | 6 +----- conf/machine/nitrogen8mn.conf | 6 +----- conf/machine/nitrogen8mp.conf | 6 +----- 8 files changed, 8 insertions(+), 44 deletions(-) diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf index 5bc786a..d56929d 100644 --- a/conf/machine/nitrogen6sx.conf +++ b/conf/machine/nitrogen6sx.conf @@ -24,12 +24,7 @@ WKS_FILE = "sdimage-bootpart.wks" IMAGE_BOOT_FILES:append = " \ boot.scr-${MACHINE};boot.scr \ " -WKS_FILE_DEPENDS = " \ - u-boot-script-boundary \ - \ - e2fsprogs-native \ - bmap-tools-native \ -" +WKS_FILE_DEPENDS += " u-boot-script-boundary" UBOOT_MACHINE ?= "nitrogen6sx_defconfig" diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf index f891e40..1a32938 100644 --- a/conf/machine/nitrogen6x-lite.conf +++ b/conf/machine/nitrogen6x-lite.conf @@ -24,12 +24,7 @@ WKS_FILE = "sdimage-bootpart.wks" IMAGE_BOOT_FILES:append = " \ boot.scr-${MACHINE};boot.scr \ " -WKS_FILE_DEPENDS = " \ - u-boot-script-boundary \ - \ - e2fsprogs-native \ - bmap-tools-native \ -" +WKS_FILE_DEPENDS += "u-boot-script-boundary" UBOOT_MACHINE ?= "nit6xlite_defconfig" diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf index b40f041..207b935 100644 --- a/conf/machine/nitrogen6x.conf +++ b/conf/machine/nitrogen6x.conf @@ -59,12 +59,7 @@ WKS_FILE = "sdimage-bootpart.wks" IMAGE_BOOT_FILES:append = " \ boot.scr-${MACHINE};boot.scr \ " -WKS_FILE_DEPENDS = " \ - u-boot-script-boundary \ - \ - e2fsprogs-native \ - bmap-tools-native \ -" +WKS_FILE_DEPENDS += "u-boot-script-boundary" UBOOT_MACHINE ?= "nitrogen6q_defconfig" diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf index 3597178..27afafb 100644 --- a/conf/machine/nitrogen7.conf +++ b/conf/machine/nitrogen7.conf @@ -24,12 +24,7 @@ WKS_FILE = "sdimage-bootpart.wks" IMAGE_BOOT_FILES:append = " \ boot.scr-${MACHINE};boot.scr \ " -WKS_FILE_DEPENDS = " \ - u-boot-script-boundary \ - \ - e2fsprogs-native \ - bmap-tools-native \ -" +WKS_FILE_DEPENDS += "u-boot-script-boundary" UBOOT_MACHINE ?= "nitrogen7_defconfig" diff --git a/conf/machine/nitrogen8m.conf b/conf/machine/nitrogen8m.conf index 734b83e..03a3a45 100644 --- a/conf/machine/nitrogen8m.conf +++ b/conf/machine/nitrogen8m.conf @@ -64,11 +64,7 @@ IMAGE_BOOT_FILES:append = " \ # wic support WKS_FILE = "sdimage-bootpart.wks" -WKS_FILE_DEPENDS += " \ - u-boot-script-boundary \ - e2fsprogs-native \ - bmap-tools-native \ -" +WKS_FILE_DEPENDS += "u-boot-script-boundary" SERIAL_CONSOLES ?= "115200;ttymxc0" diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf index d26fd9e..9ebfbe0 100644 --- a/conf/machine/nitrogen8mm.conf +++ b/conf/machine/nitrogen8mm.conf @@ -69,11 +69,7 @@ IMAGE_BOOT_FILES:append = " \ # wic support WKS_FILE = "sdimage-bootpart.wks" -WKS_FILE_DEPENDS += " \ - u-boot-script-boundary \ - e2fsprogs-native \ - bmap-tools-native \ -" +WKS_FILE_DEPENDS += "u-boot-script-boundary" SERIAL_CONSOLES = "115200;ttymxc1" diff --git a/conf/machine/nitrogen8mn.conf b/conf/machine/nitrogen8mn.conf index c99593a..c92c18f 100644 --- a/conf/machine/nitrogen8mn.conf +++ b/conf/machine/nitrogen8mn.conf @@ -63,11 +63,7 @@ IMAGE_BOOT_FILES:append = " \ # wic support WKS_FILE = "sdimage-bootpart.wks" -WKS_FILE_DEPENDS += " \ - u-boot-script-boundary \ - e2fsprogs-native \ - bmap-tools-native \ -" +WKS_FILE_DEPENDS += "u-boot-script-boundary" SERIAL_CONSOLES = "115200;ttymxc1" diff --git a/conf/machine/nitrogen8mp.conf b/conf/machine/nitrogen8mp.conf index 9e2434f..30295b2 100644 --- a/conf/machine/nitrogen8mp.conf +++ b/conf/machine/nitrogen8mp.conf @@ -60,11 +60,7 @@ IMAGE_BOOT_FILES:append = " \ upgrade.scr-${MACHINE};upgrade.scr \ imx-boot;u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \ " -WKS_FILE_DEPENDS += " \ - u-boot-script-boundary \ - e2fsprogs-native \ - bmap-tools-native \ -" +WKS_FILE_DEPENDS += "u-boot-script-boundary" OPTEE_BIN_EXT = "8mp"