From b2e2f7dbc1064fd562769ac63f91c80b8156fb4f Mon Sep 17 00:00:00 2001 From: Ramon Moesching Date: Tue, 8 May 2018 10:53:44 +0200 Subject: [PATCH] am335x & armada-385 machine config: replace image_types_u-boot with image_types As of poky commit e18cec7 image_types_uboot.bbclass has been removed and its features integrated in image_types.bbclass Signed-off-by: Ramon Moesching --- conf/machine/am335x-nbhw16.conf | 2 +- conf/machine/am335x-nrhw20.conf | 2 +- conf/machine/armada-385-nbhw14.conf | 2 +- conf/machine/armada-385-nbhw17.conf | 2 +- conf/machine/armada-385-nrhw18.conf | 2 +- conf/machine/armada-385.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/am335x-nbhw16.conf b/conf/machine/am335x-nbhw16.conf index 000d66c..d7eecaa 100644 --- a/conf/machine/am335x-nbhw16.conf +++ b/conf/machine/am335x-nbhw16.conf @@ -5,7 +5,7 @@ require conf/machine/include/ti33x.inc IMAGE_FSTYPES += "tar.gz cpio cpio.gz.u-boot" -IMAGE_CLASSES += "image_types_uboot" +IMAGE_CLASSES += "image_types" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" diff --git a/conf/machine/am335x-nrhw20.conf b/conf/machine/am335x-nrhw20.conf index 237e9fc..f0c9659 100644 --- a/conf/machine/am335x-nrhw20.conf +++ b/conf/machine/am335x-nrhw20.conf @@ -5,7 +5,7 @@ require conf/machine/include/ti33x.inc IMAGE_FSTYPES += "tar.gz cpio cpio.gz.u-boot" -IMAGE_CLASSES += "image_types_uboot" +IMAGE_CLASSES += "image_types" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" diff --git a/conf/machine/armada-385-nbhw14.conf b/conf/machine/armada-385-nbhw14.conf index 4b3472d..a801b64 100644 --- a/conf/machine/armada-385-nbhw14.conf +++ b/conf/machine/armada-385-nbhw14.conf @@ -5,7 +5,7 @@ require conf/machine/include/armada.inc IMAGE_FSTYPES += "tar.gz cpio cpio.gz.u-boot" -IMAGE_CLASSES += "image_types_uboot" +IMAGE_CLASSES += "image_types" SERIAL_CONSOLE = "115200 ttyS1" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" diff --git a/conf/machine/armada-385-nbhw17.conf b/conf/machine/armada-385-nbhw17.conf index 16c821d..3320ba0 100644 --- a/conf/machine/armada-385-nbhw17.conf +++ b/conf/machine/armada-385-nbhw17.conf @@ -5,7 +5,7 @@ require conf/machine/include/armada.inc IMAGE_FSTYPES += "tar.gz cpio cpio.gz.u-boot" -IMAGE_CLASSES += "image_types_uboot" +IMAGE_CLASSES += "image_types" SERIAL_CONSOLE = "115200 ttyS1" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" diff --git a/conf/machine/armada-385-nrhw18.conf b/conf/machine/armada-385-nrhw18.conf index e4fbdf4..6265ad7 100644 --- a/conf/machine/armada-385-nrhw18.conf +++ b/conf/machine/armada-385-nrhw18.conf @@ -5,7 +5,7 @@ require conf/machine/include/armada.inc IMAGE_FSTYPES += "tar.gz cpio cpio.gz.u-boot" -IMAGE_CLASSES += "image_types_uboot" +IMAGE_CLASSES += "image_types" SERIAL_CONSOLE = "115200 ttyS1" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-devicetree" diff --git a/conf/machine/armada-385.conf b/conf/machine/armada-385.conf index b9fbd32..adaa66a 100644 --- a/conf/machine/armada-385.conf +++ b/conf/machine/armada-385.conf @@ -5,7 +5,7 @@ require conf/machine/include/armada.inc IMAGE_FSTYPES += "tar.gz cpio cpio.gz.u-boot" -IMAGE_CLASSES += "image_types_uboot" +IMAGE_CLASSES += "image_types" SERIAL_CONSOLE = "115200 ttyS0"