[PATCH v6] u-boot: Add mkenvimage tool
This utility is used for creation of images containing
usable in run-time U-Boot environment.
As of today this utility is added per-board like here [1]
for Intel Edison board.
[1]
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb
Given there're quite some U-Boot tools that we may want to add later
this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools"
still for compatibility we provide "u-boot-mkimage" with help
of PROVIDES as well as proposed "u-boot-mkenvimage".
Signed-off-by: Alexey Brodkin
Cc: Richard Purdie
Cc: Otavio Salvador
Cc: Martin Jansa
Cc: Ross Burton
Cc: Marek Vasut
---
Changes v5 -> v6:
* Really enable separate pakaging of mkimage and mkenvimage
Changes v4 -> v5:
* Added backward compatibility with "u-boot-mkimage" recipe
* Improved handling of nativesdk
* Update all references from "u-boot-mkimage" to "u-boot-tools"
Changes v3 -> v4:
* Updated maintainer info to make Yocto autobuilder happy again
Changes v2 -> v3:
* Recipe renamed to "u-boot-tools" to better match its contents
(especially in the future as we add more tools there)
* Existing "u-boot-mkimage" and newly introduced "u-boot-mkenvimage"
made avaialble via PROVIDES
Changes v1 -> v2:
* Got rid of a separate recipe and instead added mkenvimage
to u-boot mkimage recipe
meta/classes/image_types.bbclass | 2 +-
meta/classes/kernel-fitimage.bbclass | 2 +-
meta/classes/kernel-uimage.bbclass | 2 +-
meta/conf/distro/include/distro_alias.inc | 2 +-
meta/conf/distro/include/maintainers.inc | 2 +-
...-mkimage_2018.07.bb => u-boot-tools_2018.07.bb} | 26 --
6 files changed, 29 insertions(+), 7 deletions(-)
rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2018.07.bb =>
u-boot-tools_2018.07.bb} (56%)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 05e5b0a2e0..5c406481ef 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -308,7 +308,7 @@ CONVERSION_DEPENDS_lzo = "lzop-native"
CONVERSION_DEPENDS_zip = "zip-native"
CONVERSION_DEPENDS_sum = "mtd-utils-native"
CONVERSION_DEPENDS_bmap = "bmap-tools-native"
-CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native"
+CONVERSION_DEPENDS_u-boot = "u-boot-tools-native"
CONVERSION_DEPENDS_vmdk = "qemu-native"
CONVERSION_DEPENDS_vdi = "qemu-native"
CONVERSION_DEPENDS_qcow2 = "qemu-native"
diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index 4c4fd99ff4..328bef4069 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -4,7 +4,7 @@ python __anonymous () {
kerneltypes = d.getVar('KERNEL_IMAGETYPES') or ""
if 'fitImage' in kerneltypes.split():
depends = d.getVar("DEPENDS")
-depends = "%s u-boot-mkimage-native dtc-native" % depends
+depends = "%s u-boot-tools-native dtc-native" % depends
d.setVar("DEPENDS", depends)
uarch = d.getVar("UBOOT_ARCH")
diff --git a/meta/classes/kernel-uimage.bbclass
b/meta/classes/kernel-uimage.bbclass
index c2de6bb40d..cedb4fa070 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -3,7 +3,7 @@ inherit kernel-uboot
python __anonymous () {
if "uImage" in d.getVar('KERNEL_IMAGETYPES'):
depends = d.getVar("DEPENDS")
-depends = "%s u-boot-mkimage-native" % depends
+depends = "%s u-boot-tools-native" % depends
d.setVar("DEPENDS", depends)
# Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
diff --git a/meta/conf/distro/include/distro_alias.inc
b/meta/conf/distro/include/distro_alias.inc
index 7502542e89..f23db1e8a4 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -354,7 +354,7 @@ DISTRO_PN_ALIAS_pn-tremor = "OSPDT
upstream=http://www.xiph.org/vorbis/";
DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera
Ubuntu=ttf-bitstream-vera"
DISTRO_PN_ALIAS_pn-tzcode = "OSPDT"
DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools Debian=u-boot-tools"
-DISTRO_PN_ALIAS_pn-u-boot-mkimage = "Ubuntu=uboot-mkimage Debian=uboot-mkimage"
+DISTRO_PN_ALIAS_pn-u-boot-tools = "Ubuntu=u-boot-tools Debian=uboot-tools"
DISTRO_PN_ALIAS_pn-udev = "Mandriva=udev Fedora=udev"
DISTRO_PN_ALIAS_pn-udev-extraconf = "OE-Core"
DISTRO_PN_ALIAS_pn-unfs3 = "Debian=unfs3 Fedora=unfs3"
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 0889c1c429..825c24a3f8 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -654,7 +654,7 @@ RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster
"
RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster "
RECIPE_MAINTAINER_pn-u-boot = "Marek Vasut "
RECIPE_MAINTAINER_pn-u-boot-fw-uti
Re: [OE-core] [PATCH v6] u-boot: Add mkenvimage tool
Hello Alexey, On Thu, Nov 22, 2018 at 6:28 AM Alexey Brodkin wrote: > > This utility is used for creation of images containing > usable in run-time U-Boot environment. > > As of today this utility is added per-board like here [1] > for Intel Edison board. > > [1] > http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb > > Given there're quite some U-Boot tools that we may want to add later > this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" > still for compatibility we provide "u-boot-mkimage" with help > of PROVIDES as well as proposed "u-boot-mkenvimage". > > Signed-off-by: Alexey Brodkin > Cc: Richard Purdie > Cc: Otavio Salvador > Cc: Martin Jansa > Cc: Ross Burton > Cc: Marek Vasut Acked-by: Otavio Salvador I'd like to thank you to keep the pace until it was ready. I know it may be challenging to contribute to new projects and OpenEmbedded is no different. You were very welcoming to comments and change requests and I believe it was a great thread of changes which lead to a good patch. I look forward to the new patches you'll start submitting from now on :-) Keep the good work. Best Regards, -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750 ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [OE-core] [PATCH v6] u-boot: Add mkenvimage tool
Hi Otavio, On Thu, 2018-11-22 at 07:30 -0200, Otavio Salvador wrote: > Hello Alexey, > > On Thu, Nov 22, 2018 at 6:28 AM Alexey Brodkin > wrote: > > This utility is used for creation of images containing > > usable in run-time U-Boot environment. > > > > As of today this utility is added per-board like here [1] > > for Intel Edison board. > > > > [1] > > https://urldefense.proofpoint.com/v2/url?u=http-3A__git.yoctoproject.org_cgit_cgit.cgi_meta-2Dintel-2Dedison_tree_meta-2Dintel-2Dedison-2Dbsp_recipes-2Dbsp_u-2Dboot_u-2Dboot-2Dtools-5F2014.04.bb&d=DwICAg&c=DPL6_X_6JkXFx7AXWqB0tg&r=lqdeeSSEes0GFDDl656eViXO7breS55ytWkhpk5R81I&m=0oSj04biS8fsfFjYHNTIfKozS-TUjseTTeyuKHHcljA&s=hpwGEnrX5gArYJHLxYhMZ4x6s3irTZyCMjjnFipip7k&e= > > > > Given there're quite some U-Boot tools that we may want to add later > > this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" > > still for compatibility we provide "u-boot-mkimage" with help > > of PROVIDES as well as proposed "u-boot-mkenvimage". > > > > Signed-off-by: Alexey Brodkin > > Cc: Richard Purdie > > Cc: Otavio Salvador > > Cc: Martin Jansa > > Cc: Ross Burton > > Cc: Marek Vasut > > Acked-by: Otavio Salvador > > I'd like to thank you to keep the pace until it was ready. I know it > may be challenging to contribute to new projects and OpenEmbedded is > no different. > > You were very welcoming to comments and change requests and I believe > it was a great thread of changes which lead to a good patch. I look > forward to the new patches you'll start submitting from now on :-) I'd like to thank you guys as well for being patient and providing meaningful comments for my naive and sometime silly changes. And sure there will be more patches as now we start using OE for quite some projects basically trying to get ARC up to speed in OE as good as possible and given our architecture differs a bit from others (as any other arch) we're not only adding features but more fix issues that were not seen before due to pure luck... like we typically have 8k MMU page a bit exotic int64_t alignment by 32 bits etc so there'll be more stuff from us in the foreseeable future :) -Alexey ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
[PATCH] gcc: Select proper ARC CPU when build for target
By default GCC for ARC is configured with ARC700 CPU.
This means when we don't pass "-mcpu=xxx":
a) Code will be compiled for ARC700
b) Libs will used for ARC700
And if we happen to run on ARCv2 core like ARC HSxx we
won't be able to use target gcc w/o "-mcpu=xxx" which
is not very convenient as we want to build "target" toolchain
but not canadian-cross.
Note the trick here is we set TUNE_PKGARCH in just 2 values,
it is either "arc700" for all ARCompact cores (ARC750 & ARC770)
and "archs" for all ARCv2 cores (ARC HS38 & HS48), see [1].
This gives us usable defaults.
For cross-compilation we use TUNE_CCARGS for fine-tuning depending
on which HW features we have on the current target so that
we may have HW feature A & B or B & C or A & B & C, see [2].
[1]
https://github.com/foss-for-synopsys-dwc-arc-processors/meta-synopsys/blob/master/conf/machine/include/tune-arcv2.inc#L4
[2]
https://github.com/foss-for-synopsys-dwc-arc-processors/meta-synopsys/blob/master/conf/machine/include/tune-arcv2.inc#L34
Signed-off-by: Alexey Brodkin
---
meta/recipes-devtools/gcc/gcc-target.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc
b/meta/recipes-devtools/gcc/gcc-target.inc
index bc2236fed0..6270059644 100644
--- a/meta/recipes-devtools/gcc/gcc-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-target.inc
@@ -20,6 +20,7 @@ ARMFPARCHEXT ?= ""
EXTRA_OECONF_append_armv6 = " --with-arch=armv6${ARMFPARCHEXT}"
EXTRA_OECONF_append_armv7a = " --with-arch=armv7-a${ARMFPARCHEXT}"
EXTRA_OECONF_append_armv7ve = " --with-arch=armv7ve${ARMFPARCHEXT}"
+EXTRA_OECONF_append_arc = " --with-cpu=${TUNE_PKGARCH}"
# libcc1 requres gcc_cv_objdump when cross build, but gcc_cv_objdump is
# set in subdir gcc, so subdir libcc1 can't use it, export it here to
--
2.16.2
___
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH v6] u-boot: Add mkenvimage tool
Hi, Richard, Otavio, On Thu, 2018-11-22 at 11:28 +0300, Alexey Brodkin wrote: > This utility is used for creation of images containing > usable in run-time U-Boot environment. > > As of today this utility is added per-board like here [1] > for Intel Edison board. > > [1] > http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb > > Given there're quite some U-Boot tools that we may want to add later > this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools" > still for compatibility we provide "u-boot-mkimage" with help > of PROVIDES as well as proposed "u-boot-mkenvimage". > > Signed-off-by: Alexey Brodkin > Cc: Richard Purdie > Cc: Otavio Salvador > Cc: Martin Jansa > Cc: Ross Burton > Cc: Marek Vasut > --- > > Changes v5 -> v6: > * Really enable separate pakaging of mkimage and mkenvimage > > Changes v4 -> v5: > * Added backward compatibility with "u-boot-mkimage" recipe > * Improved handling of nativesdk > * Update all references from "u-boot-mkimage" to "u-boot-tools" > > Changes v3 -> v4: > * Updated maintainer info to make Yocto autobuilder happy again > > Changes v2 -> v3: > * Recipe renamed to "u-boot-tools" to better match its contents >(especially in the future as we add more tools there) > * Existing "u-boot-mkimage" and newly introduced "u-boot-mkenvimage" >made avaialble via PROVIDES > > Changes v1 -> v2: > * Got rid of a separate recipe and instead added mkenvimage >to u-boot mkimage recipe So apparently something is still broken :( ->8--- NOTE: Resolving any missing task queue dependencies ERROR: Nothing RPROVIDES 'u-boot-tools-native-mkimage-native' (but virtual:native:.../openembedded-core/meta/recipes-bsp/u-boot/u-boot- tools_2018.07.bb RDEPENDS on or otherwise requires it) NOTE: Runtime target 'u-boot-tools-native-mkimage-native' is unbuildable, removing... Missing or unbuildable dependency chain was: ['u-boot-tools-native-mkimage-native'] ERROR: Required build target 'core-image-base' has no buildable providers. Missing or unbuildable dependency chain was: ['core-image-base', 'virtual/kernel', 'u-boot-tools-native', 'u-boot-tools-native-mkimage-native'] ->8--- Indeed "u-boot-tools-native-mkimage-native" looks quite odd. Any hints on how that could be addressed? -Alexey ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH v6] u-boot: Add mkenvimage tool
On Thu, 2018-11-22 at 13:18 +, Alexey Brodkin wrote:
> Hi, Richard, Otavio,
>
> On Thu, 2018-11-22 at 11:28 +0300, Alexey Brodkin wrote:
> > This utility is used for creation of images containing
> > usable in run-time U-Boot environment.
> >
> > As of today this utility is added per-board like here [1]
> > for Intel Edison board.
> >
> > [1]
> > http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb
> >
> > Given there're quite some U-Boot tools that we may want to add
> > later
> > this recipe name switch from "u-boot-mkimage" to generic "u-boot-
> > tools"
> > still for compatibility we provide "u-boot-mkimage" with help
> > of PROVIDES as well as proposed "u-boot-mkenvimage".
> >
> > Signed-off-by: Alexey Brodkin
> > Cc: Richard Purdie
> > Cc: Otavio Salvador
> > Cc: Martin Jansa
> > Cc: Ross Burton
> > Cc: Marek Vasut
> > ---
> >
> > Changes v5 -> v6:
> > * Really enable separate pakaging of mkimage and mkenvimage
> >
> > Changes v4 -> v5:
> > * Added backward compatibility with "u-boot-mkimage" recipe
> > * Improved handling of nativesdk
> > * Update all references from "u-boot-mkimage" to "u-boot-tools"
> >
> > Changes v3 -> v4:
> > * Updated maintainer info to make Yocto autobuilder happy again
> >
> > Changes v2 -> v3:
> > * Recipe renamed to "u-boot-tools" to better match its contents
> >(especially in the future as we add more tools there)
> > * Existing "u-boot-mkimage" and newly introduced "u-boot-
> > mkenvimage"
> >made avaialble via PROVIDES
> >
> > Changes v1 -> v2:
> > * Got rid of a separate recipe and instead added mkenvimage
> >to u-boot mkimage recipe
>
> So apparently something is still broken :(
> ->8---
> NOTE: Resolving any missing task queue dependencies
> ERROR: Nothing RPROVIDES 'u-boot-tools-native-mkimage-native' (but
> virtual:native:.../openembedded-core/meta/recipes-bsp/u-boot/u-boot-
> tools_2018.07.bb RDEPENDS on or otherwise requires it)
>
> NOTE: Runtime target 'u-boot-tools-native-mkimage-native' is
> unbuildable, removing...
> Missing or unbuildable dependency chain was: ['u-boot-tools-native-
> mkimage-native']
>
> ERROR: Required build target 'core-image-base' has no buildable
> providers.
> Missing or unbuildable dependency chain was: ['core-image-base',
> 'virtual/kernel', 'u-boot-tools-native', 'u-boot-tools-native-
> mkimage-native']
> ->8---
>
> Indeed "u-boot-tools-native-mkimage-native" looks quite odd.
>
> Any hints on how that could be addressed?
Just guessing but maybe
RDEPENDS_${PN}_class-native = ""
?
Cheers,
Richard
___
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
Re: [PATCH v2 0/2] MTD: spi-nor: add support for sst26wf016, sst26wf032
Hi, Eugeniy, This is just to let you know that I'm getting familiar with the individual block lock support. You'll have my review in the first part of next week. Thank you for your patience, ta On 11/19/2018 05:25 PM, Eugeniy Paltsev wrote: > Hi Boris, > > As 4.20-rc1 is already out I guess you can pick this patches to spi-nor/next? > > Thanks. > > On Mon, 2018-10-22 at 15:56 +0200, Boris Brezillon wrote: >> +Tudor >> >> Hi Eugeniy, >> >> Sorry, it's already too late for 4.20, and I won't apply patches to the >> spi-nor/next branch before 4.20-rc1 is out. >> >> Tudor, Marek, can I have a Reviewed-by/Acked-by on this patchset? >> >> Thanks, >> >> Boris >> >>> >>> On Mon, 2018-09-10 at 14:46 +0300, Eugeniy Paltsev wrote: Add support for the SST sst26wf016 and sst26wf032 flash IC: sst26wf*** flash series block protection implementation differs from other SST series, so we add implementation for sst26wf*** lock/unlock/is_locked functions. Add sst26wf016 and sst26wf032 flash IC info to spi_flash_ids list. Eugeniy Paltsev (2): mtd: spi-nor: Add support of sst26wf* flash ICs protection ops mtd: spi-nor: add support for sst26wf016, sst26wf032 drivers/mtd/spi-nor/spi-nor.c | 179 ++ include/linux/mtd/spi-nor.h | 4 + 2 files changed, 183 insertions(+) >> >> ___ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc
[PATCH] arc: Disable LTTng
LTTng depends on liburcu which is not yet ported to ARC
so disable LTTng on ARC for now.
Signed-off-by: Alexey Brodkin
---
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 3 +++
meta/recipes-devtools/gdb/gdb-common.inc | 1 +
meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb| 1 +
3 files changed, 5 insertions(+)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 33d9c09a66..762c046636 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -38,13 +38,16 @@ SYSTEMTAP_riscv64 = ""
# lttng-ust uses sched_getcpu() which is not there on for some platforms.
LTTNGUST = "lttng-ust"
LTTNGUST_libc-musl = ""
+LTTNGUST_arc = ""
LTTNGUST_riscv64 = ""
LTTNGTOOLS = "lttng-tools"
LTTNGTOOLS_libc-musl = ""
+LTTNGTOOLS_arc = ""
LTTNGTOOLS_riscv64 = ""
LTTNGMODULES = "lttng-modules"
+LTTNGMODULES_arc = ""
LTTNGMODULES_riscv64 = ""
BABELTRACE = "babeltrace"
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc
b/meta/recipes-devtools/gdb/gdb-common.inc
index fa64939f26..57bc0dc773 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -4,6 +4,7 @@ SECTION = "devel"
DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native"
LTTNGUST = "lttng-ust"
+LTTNGUST_arc = ""
LTTNGUST_aarch64 = ""
LTTNGUST_riscv64 = ""
LTTNGUST_mipsarch = ""
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb
b/meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb
index 11d7db6848..85ed3c691b 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.10.5.bb
@@ -25,6 +25,7 @@ PACKAGECONFIG[lttng-ust] = "--with-lttng-ust,
--without-lttng-ust, lttng-ust"
PACKAGECONFIG[kmod] = "--with-kmod, --without-kmod, kmod"
PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages,
asciidoc-native xmlto-native libxslt-native"
PACKAGECONFIG_remove_libc-musl = "lttng-ust"
+PACKAGECONFIG_remove_arc = "lttng-ust"
PACKAGECONFIG_remove_riscv64 = "lttng-ust"
SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
--
2.16.2
___
linux-snps-arc mailing list
linux-snps-arc@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-snps-arc
[PATCH v7] u-boot: Add mkenvimage tool
This utility is used for creation of images containing
usable in run-time U-Boot environment.
As of today this utility is added per-board like here [1]
for Intel Edison board.
[1]
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-edison/tree/meta-intel-edison-bsp/recipes-bsp/u-boot/u-boot-tools_2014.04.bb
Given there're quite some U-Boot tools that we may want to add later
this recipe name switch from "u-boot-mkimage" to generic "u-boot-tools"
still for compatibility we provide "u-boot-mkimage" with help
of PROVIDES as well as proposed "u-boot-mkenvimage".
Signed-off-by: Alexey Brodkin
Cc: Richard Purdie
Cc: Otavio Salvador
Cc: Martin Jansa
Cc: Ross Burton
Cc: Marek Vasut
---
Changes v6 -> v7:
* Fix building "u-boot-tools-native"
Changes v5 -> v6:
* Really enable separate pakaging of mkimage and mkenvimage
Changes v4 -> v5:
* Added backward compatibility with "u-boot-mkimage" recipe
* Improved handling of nativesdk
* Update all references from "u-boot-mkimage" to "u-boot-tools"
Changes v3 -> v4:
* Updated maintainer info to make Yocto autobuilder happy again
Changes v2 -> v3:
* Recipe renamed to "u-boot-tools" to better match its contents
(especially in the future as we add more tools there)
* Existing "u-boot-mkimage" and newly introduced "u-boot-mkenvimage"
made avaialble via PROVIDES
Changes v1 -> v2:
* Got rid of a separate recipe and instead added mkenvimage
to u-boot mkimage recipe
meta/classes/image_types.bbclass | 2 +-
meta/classes/kernel-fitimage.bbclass | 2 +-
meta/classes/kernel-uimage.bbclass | 2 +-
meta/conf/distro/include/distro_alias.inc | 2 +-
meta/conf/distro/include/maintainers.inc | 2 +-
...-mkimage_2018.07.bb => u-boot-tools_2018.07.bb} | 27 --
6 files changed, 30 insertions(+), 7 deletions(-)
rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2018.07.bb =>
u-boot-tools_2018.07.bb} (55%)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 05e5b0a2e0..5c406481ef 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -308,7 +308,7 @@ CONVERSION_DEPENDS_lzo = "lzop-native"
CONVERSION_DEPENDS_zip = "zip-native"
CONVERSION_DEPENDS_sum = "mtd-utils-native"
CONVERSION_DEPENDS_bmap = "bmap-tools-native"
-CONVERSION_DEPENDS_u-boot = "u-boot-mkimage-native"
+CONVERSION_DEPENDS_u-boot = "u-boot-tools-native"
CONVERSION_DEPENDS_vmdk = "qemu-native"
CONVERSION_DEPENDS_vdi = "qemu-native"
CONVERSION_DEPENDS_qcow2 = "qemu-native"
diff --git a/meta/classes/kernel-fitimage.bbclass
b/meta/classes/kernel-fitimage.bbclass
index 4c4fd99ff4..328bef4069 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -4,7 +4,7 @@ python __anonymous () {
kerneltypes = d.getVar('KERNEL_IMAGETYPES') or ""
if 'fitImage' in kerneltypes.split():
depends = d.getVar("DEPENDS")
-depends = "%s u-boot-mkimage-native dtc-native" % depends
+depends = "%s u-boot-tools-native dtc-native" % depends
d.setVar("DEPENDS", depends)
uarch = d.getVar("UBOOT_ARCH")
diff --git a/meta/classes/kernel-uimage.bbclass
b/meta/classes/kernel-uimage.bbclass
index c2de6bb40d..cedb4fa070 100644
--- a/meta/classes/kernel-uimage.bbclass
+++ b/meta/classes/kernel-uimage.bbclass
@@ -3,7 +3,7 @@ inherit kernel-uboot
python __anonymous () {
if "uImage" in d.getVar('KERNEL_IMAGETYPES'):
depends = d.getVar("DEPENDS")
-depends = "%s u-boot-mkimage-native" % depends
+depends = "%s u-boot-tools-native" % depends
d.setVar("DEPENDS", depends)
# Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
diff --git a/meta/conf/distro/include/distro_alias.inc
b/meta/conf/distro/include/distro_alias.inc
index 7502542e89..f23db1e8a4 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -354,7 +354,7 @@ DISTRO_PN_ALIAS_pn-tremor = "OSPDT
upstream=http://www.xiph.org/vorbis/";
DISTRO_PN_ALIAS_pn-ttf-bitstream-vera = "Debian=ttf-bitstream-vera
Ubuntu=ttf-bitstream-vera"
DISTRO_PN_ALIAS_pn-tzcode = "OSPDT"
DISTRO_PN_ALIAS_pn-u-boot-fw-utils = "Ubuntu=u-boot-tools Debian=u-boot-tools"
-DISTRO_PN_ALIAS_pn-u-boot-mkimage = "Ubuntu=uboot-mkimage Debian=uboot-mkimage"
+DISTRO_PN_ALIAS_pn-u-boot-tools = "Ubuntu=u-boot-tools Debian=uboot-tools"
DISTRO_PN_ALIAS_pn-udev = "Mandriva=udev Fedora=udev"
DISTRO_PN_ALIAS_pn-udev-extraconf = "OE-Core"
DISTRO_PN_ALIAS_pn-unfs3 = "Debian=unfs3 Fedora=unfs3"
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 05a2c9f38a..8a4362d947 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -656,7 +656,7 @@ RECIPE_MAINTAINER_pn-tzcode-native = "Armin Kuster
"
RECIPE_MAINTAINER_pn-tzdata = "Armin Kuster "
RECIPE_MAINTAINER_pn-u-b
