Re: [ptxdist] [PATCH] u-boot: Add support for SPL for non-OMAP CPUs
Hello,
Any comments?
Thank you,
Guillermo
El mar., 23 oct. 2018 a las 16:32, Guillermo Rodríguez
() escribió:
>
> Add support for installing the SPL binary for non-OMAP CPUs.
>
> Also properly remove any files installed in the platform image
> directory in the clean stage.
>
> Signed-off-by: Guillermo Rodriguez
> ---
> platforms/u-boot.in | 14 +++---
> rules/u-boot.make | 4
> 2 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/platforms/u-boot.in b/platforms/u-boot.in
> index 38684a0..602de46 100644
> --- a/platforms/u-boot.in
> +++ b/platforms/u-boot.in
> @@ -49,6 +49,13 @@ config U_BOOT_INSTALL_ELF
> help
> Installing the U-Boot ELF binary into platform image directory.
>
> +config U_BOOT_INSTALL_SPL
> + prompt "install SPL"
> + bool
> + help
> + Installing the U-Boot SPL (Secondary Program Loader) binary into
> + platform image directory.
> +
> config U_BOOT_INSTALL_MLO
> prompt "install MLO"
> bool
> @@ -57,14 +64,14 @@ config U_BOOT_INSTALL_MLO
> Installing the U-Boot SPL ("MLO") binary needed for OMAP CPUs into
> platform
> image directory.
>
> -if U_BOOT_INSTALL_MLO
> +if U_BOOT_INSTALL_MLO || U_BOOT_INSTALL_SPL
>
> config U_BOOT_INSTALL_U_BOOT_IMG
> prompt "install u-boot.img"
> bool
> help
> Installing the u-boot image with header ("u-boot.img") which is
> executed
> - by u-boot SPL ("MLO") into platform image directory.
> + by u-boot SPL into platform image directory.
>
> endif
>
> @@ -73,7 +80,8 @@ config U_BOOT_INSTALL_U_BOOT_IMX
> bool
> help
> Installing the U-Boot image with imx header (u-boot.imx) into
> platform
> - image directory. Say yes if you are building for freescale i.MX SOC
> + image directory. Say yes if you are building for freescale i.MX SOCs
> + and are not using SPL.
>
> endif
>
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index 94aa774..9f69f9d 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -69,6 +69,9 @@ endif
> ifdef PTXCONF_U_BOOT_INSTALL_ELF
> @install -D -m644 $(U_BOOT_DIR)/u-boot $(IMAGEDIR)/u-boot.elf
> endif
> +ifdef PTXCONF_U_BOOT_INSTALL_SPL
> + @install -D -m644 $(U_BOOT_DIR)/SPL $(IMAGEDIR)/SPL
> +endif
> ifdef PTXCONF_U_BOOT_INSTALL_MLO
> @install -D -m644 $(U_BOOT_DIR)/MLO $(IMAGEDIR)/MLO
> endif
> @@ -88,6 +91,7 @@ $(STATEDIR)/u-boot.clean:
> @$(call targetinfo)
> @$(call clean_pkg, U_BOOT)
> @rm -f $(IMAGEDIR)/u-boot.bin $(IMAGEDIR)/u-boot.srec
> $(IMAGEDIR)/u-boot.elf
> + @rm -f $(IMAGEDIR)/u-boot.img $(IMAGEDIR)/SPL $(IMAGEDIR)/MLO
> @rm -f $(IMAGEDIR)/u-boot.imx
>
> # vim: syntax=make
> --
> 1.9.1
>
--
Guillermo Rodriguez Garcia
guille.rodrig...@gmail.com
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] classpath: Fix building with OpenJDK 1.8
Hello all, Any feedback on this one ? Guillermo El mié., 31 oct. 2018 a las 16:12, Guillermo Rodríguez () escribió: > > Also move back from staging. > > Signed-off-by: Guillermo Rodriguez > --- > .../0001-Fix-building-with-OpenJDK-1.8.patch | 50 > ++ > patches/classpath-0.99/series | 1 + > rules/classpath.in | 7 +-- > 3 files changed, 52 insertions(+), 6 deletions(-) > create mode 100644 > patches/classpath-0.99/0001-Fix-building-with-OpenJDK-1.8.patch > create mode 100644 patches/classpath-0.99/series > > diff --git a/patches/classpath-0.99/0001-Fix-building-with-OpenJDK-1.8.patch > b/patches/classpath-0.99/0001-Fix-building-with-OpenJDK-1.8.patch > new file mode 100644 > index 000..fe7d3ba > --- /dev/null > +++ b/patches/classpath-0.99/0001-Fix-building-with-OpenJDK-1.8.patch > @@ -0,0 +1,50 @@ > +This patch makes it possible to build GNU Classpath using javac > +from OpenJDK 1.7 and 1.8. > + > +- From the javac docs: "Classes found through the classpath are > +subject to automatic recompilation if their sources are found." > +javac from OpenJDK 1.7+ will try (and fail) to recompile "standard" > +Java classes (e.g. java/lang/Object.java) when compiling the Java > +test class. Fix this by explicitly passing an empty -sourcepath. > + > +- Test for 1.6 instead of 1.5, as -source/-target 1.5 is deprecated > +in Java 8, and the Makefiles already use -source/-target 1.6 anyway. > + > +--- > + m4/ac_prog_java_works.m4 | 3 ++- > + m4/ac_prog_javac_works.m4 | 4 ++-- > + 2 files changed, 4 insertions(+), 3 deletions(-) > + > +diff --git a/m4/ac_prog_java_works.m4 b/m4/ac_prog_java_works.m4 > +index d3f2744..f36318b 100644 > +--- a/m4/ac_prog_java_works.m4 > b/m4/ac_prog_java_works.m4 > +@@ -62,7 +62,8 @@ EOF > + changequote([, ])dnl > + if test x$ac_cv_prog_uudecode_base64 != xyes; then > + AC_REQUIRE([AC_PROG_JAVAC_WORKS]) > +-if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) && test -s > $CLASS_TEST; then > ++ CMD="$JAVAC $JAVACFLAGS -sourcepath '' $JAVA_TEST" > ++if AC_TRY_COMMAND($CMD) && test -s $CLASS_TEST; then > + : > + else > + echo "configure: failed program was:" >_FD_CC > +diff --git a/m4/ac_prog_javac_works.m4 b/m4/ac_prog_javac_works.m4 > +index 7fb298d..fbe24ce 100644 > +--- a/m4/ac_prog_javac_works.m4 > b/m4/ac_prog_javac_works.m4 > +@@ -33,9 +33,9 @@ public class Object > + } > + EOF > + if test x$JAVAC_IS_GCJ = xyes; then > +- CMD="$JAVAC $JAVACFLAGS -fsource=1.5 -ftarget=1.5 $JAVA_TEST" > ++ CMD="$JAVAC $JAVACFLAGS -fsource=1.6 -ftarget=1.6 $JAVA_TEST" > + else > +- CMD="$JAVAC $JAVACFLAGS -source 1.5 -target 1.5 $JAVA_TEST" > ++ CMD="$JAVAC $JAVACFLAGS -sourcepath '' -source 1.6 -target 1.6 $JAVA_TEST" > + fi > + if AC_TRY_COMMAND($CMD) >/dev/null 2>&1; then > + ac_cv_prog_javac_works=yes > +-- > +1.9.1 > + > diff --git a/patches/classpath-0.99/series b/patches/classpath-0.99/series > new file mode 100644 > index 000..1fffdbd > --- /dev/null > +++ b/patches/classpath-0.99/series > @@ -0,0 +1 @@ > +0001-Fix-building-with-OpenJDK-1.8.patch > diff --git a/rules/classpath.in b/rules/classpath.in > index 67b5dca..16017b2 100644 > --- a/rules/classpath.in > +++ b/rules/classpath.in > @@ -1,6 +1,4 @@ > -## SECTION=staging > -## old section: > -### SECTION=bytecode_engines > +## SECTION=bytecode_engines > > config CLASSPATH > tristate > @@ -12,6 +10,3 @@ config CLASSPATH > free core class libraries for use with virtual machines and > compilers > for the java programming language. > > - STAGING: remove in ptxdist-2019.04.0 > - Old, obsolete package that fails to build with OpenJDK 9. > - > -- > 1.9.1 > -- Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [ANNOUNCE] PTXdist 2018.11.0 released
Hi,
I'm happy to announce that I've just released ptxdist-2018.11.0.
There are no big changes this time.
We have some improvements to rebuild packages depending on various changes.
If a package has a _CONFIG variable and it contains an absolute path,
then the prepare stage will automatically depend on it.
With the new '--dirty' option, any config, rule and menu files are ignored
when generating dependencies. For inter-package dependencies all timestamps
are ignored. This is useful while developing package rules. Rebuilds can be
triggered by dropping the desired stage.
With the update to Python 3.7.0 generating python3 .pyc files is not
deterministic.
Various bugs related to layers and config files have been fixed. For BSPs
that use layers, updating is highly recommended.
The documentation has been fixed and improved in various places.
And we have, of course, the usual mix of version bumps, bugfixes and new
packages.
Thanks to all contributors and - as always - the shortlog below.
Enjoy,
Michael Olbrich
Ahmad Fatoum (2):
doc: Fix typos
doc: user_manual: use |ptxdist{BSP, Platform}Name| where appropriate
Aleksander Morgado (1):
iperf: enable multicast unconditionally
Alexander Dahl (2):
timezone: Change default to empty string
tz: version bump 2018e -> 2018f
Andreas Pretzsch (1):
squashfs-tools: remove old patches for v3.4 (version removed)
andrej.gantv...@wago.com (1):
ptxd_install_resolve_usr_grp: skip empty params
Clemens Gruber (1):
rng-tools: remove unneeded dependencies
Guillermo Rodriguez (1):
stm32flash: New package
Guillermo Rodríguez (2):
fbv: Restored package
imx-kobs: New package
Juergen Borleis (11):
host-libtasn1: add new package for host tool usage
host-p11-kit: add new package for host tool usage
host-softhsm: add new host tool
host-opensc: add new host tool
host-libp11: add new package for host tool usage
hostapd: provide a default run-time configuration
lighttpd: use names instead of numerical values for owner and group
dnsmasq: version bump 2.77 -> 2.79
kernel: improve perf tools with libunwind
libuv: add new library for asynchronous event notifications
rng-tools: version bump 5 -> 6.5
Ladislav Michl (6):
jimtcl: new package
usb_modeswitch: version bump 2.5.1 -> 2.5.2
usb_modeswitch: link dispatcher against JimTcl
alsa-lib: version bump 1.1.4.1 -> 1.1.7
alsa-utils: version bump 1.1.1 -> 1.1.7
networkmanager: version bump 1.14.0 -> 1.14.2
Marc Kleine-Budde (1):
mtd-utils: use tab for indention, rather than spaces
Michael Olbrich (100):
doc: fix and improve rule file documentation
doc: fix pre-built archive documentation
doc: hide incorrect figure
gdb: optionally use toolchain gdb version
host-libcurl: don't install bin/curl to sysroot-host
rules: use PTX_PACKAGES_SELECTED where appropriate
rules: introduce EXTRA_PACKAGES
gst-libav1: avoid make startup shell calles if the package is disabled
pre/gdb: use ':='
gcclibs: simplify version handling
binutils: simplify version handling
install_check: improve sanity check
wpa_supplicant: rename config file variables
hostapd: rename config file variables
ptxd_install_setup: add the failing command to the error message
dbus: version bump 1.12.2 -> 1.12.10
munin: rename config file variable
ptxd_lib_dgen: let packages depend on config files
barebox/kernel: drop explicit dependency
glib: version bump 2.56.1 -> 2.56.3
e2fsprogs: version bump 1.44.3 -> 1.44.4
nettle: version bump 3.3 -> 3.4
gnutls: version bump 3.6.2 -> 3.6.4
libelf: version bump 0.171 -> 0.174
libkmod: version bump 24 -> 25
lz4: version bump 1.8.0 -> 1.8.3
ptxd_make_image_genimage: speed up config dependencies
ptx/in-path: rewrite in make
ptx/in-platformconfigdir: rewrite in make
ptxd_make_world_{extract,patchin}: handle lndir:// like file://
dtc: use the improved ptx/in-path macro
ptxd_make_world_install_post: improve pkg-config whitelist handling
host-pkg-config: enable dev package
ptxd_make_xpkg_finish_impl: propagate errors properly
opkg-utils: propagate Installed-Size properly
ptxd_make_xpkg_finish: fill in Installed-Size
host-autotools-autoconf: make it relocatable and enable devpkg
host-autotools-automake: make it relocatable and enable devpkg
ptxd_make_world_init: improve logfile ordering
strace: version bump 4.20 -> 4.24
util-linux-ng: version bump 2.32 -> 2.32.1
libtasn1: version bump 4.12 -> 4.13
ptxd_lib_dgen: make sure the source -> package mapping is defined
ptxdist: fix PTXDIST_TOPDIR as explicit last layer
ptxdist: handle explicit ptxdist layer with --auto-version
ptxd_kconfig_find_config: allow 'run' on layers
Re: [ptxdist] [PATCH 2/2] gdb, gdbserver: prefer the source md5sum from the toolchain
On Thu, Nov 08, 2018 at 01:13:42PM +0100, Roland Hieber wrote: > If the md5sum can be autodetected from the toolchain, we should use the > value from the toolchain and ignore the value specified in the menu. > This eases migration for BSPs that previously specified it in the menu > and didn't clear it when enabling GDB_TOOLCHAIN_VERSION (which defaults > to 'y' if GDBSERVER is used). > > Some older OSELAS toolchains (and also non-OSELAS toolchains) don't set > PTXCONF_CROSS_GDB_MD5 in their ptxconfig (or they simply don't have a > ptxconfig). In those cases, the md5sum must be specified in the menu. I used the current order deliberately: It allows overwriting the md5sum if necessary. Michael > Signed-off-by: Roland Hieber > --- > rules/gdb-menu.in | 12 > rules/pre/gdb.make | 5 +++-- > 2 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/rules/gdb-menu.in b/rules/gdb-menu.in > index d8be3fef8..af69aca56 100644 > --- a/rules/gdb-menu.in > +++ b/rules/gdb-menu.in > @@ -22,16 +22,20 @@ config GDB_VERSION > endif > > config GDB_MD5 > string "gdb source md5sum" > default "d42841167fd061d90fddf9a7212a1f9f" if !GDB_TOOLCHAIN_VERSION > help > - md5sum for the gdb source archive. If the version is provided by > - the toolchain and the toolchain is a OSELAS.Toolchain then this > - can be left empty and the md5sum from the toolchain ptxconfig is > - used. > + md5sum for the gdb source archive. > + > + If the version is provided by the toolchain and its md5sum can be > + autodetected (e.g. with newer OSELAS.Toolchains), then the md5sum > + from the toolchain is used instead and the value specified here is > + ignored. > + > + Otherwise, specify the md5sum of the tar.xz archive. > > endif > > source "generated/debug_tools_gdb.in" > > endmenu > diff --git a/rules/pre/gdb.make b/rules/pre/gdb.make > index 31b1975d6..11f48381d 100644 > --- a/rules/pre/gdb.make > +++ b/rules/pre/gdb.make > @@ -11,14 +11,15 @@ > SHARED_GDB_MD5 := $(call remove_quotes,$(PTXCONF_GDB_MD5)) > > ifdef PTXCONF_GDB_TOOLCHAIN_VERSION > TOOLCHAIN_CONFIG := $(PTXDIST_PLATFORMDIR)/selected_toolchain/ptxconfig > ifneq ($(wildcard $(TOOLCHAIN_CONFIG)),) > SHARED_GDB_VERSION := $(call remove_quotes,$(shell ptxd_get_kconfig > $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_VERSION)) > -ifeq ($(SHARED_GDB_MD5),) > -SHARED_GDB_MD5 := $(call remove_quotes,$(shell > ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_MD5)) > +TOOLCHAIN_GDB_MD5:= $(call remove_quotes,$(shell ptxd_get_kconfig > $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_MD5)) > +ifneq ($(TOOLCHAIN_GDB_MD5),) > +SHARED_GDB_MD5 := $(TOOLCHAIN_GDB_MD5) > endif > else > SHARED_GDB_VERSION := $(shell $(PTXCONF_COMPILER_PREFIX)gdb -v | sed -e > 's/.* //;q') > endif > else > SHARED_GDB_VERSION := $(call remove_quotes,$(PTXCONF_GDB_VERSION)) > -- > 2.19.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] gdb, gdbserver: prefer the source md5sum from the toolchain
If the md5sum can be autodetected from the toolchain, we should use the value from the toolchain and ignore the value specified in the menu. This eases migration for BSPs that previously specified it in the menu and didn't clear it when enabling GDB_TOOLCHAIN_VERSION (which defaults to 'y' if GDBSERVER is used). Some older OSELAS toolchains (and also non-OSELAS toolchains) don't set PTXCONF_CROSS_GDB_MD5 in their ptxconfig (or they simply don't have a ptxconfig). In those cases, the md5sum must be specified in the menu. Signed-off-by: Roland Hieber --- rules/gdb-menu.in | 12 rules/pre/gdb.make | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/rules/gdb-menu.in b/rules/gdb-menu.in index d8be3fef8..af69aca56 100644 --- a/rules/gdb-menu.in +++ b/rules/gdb-menu.in @@ -22,16 +22,20 @@ config GDB_VERSION endif config GDB_MD5 string "gdb source md5sum" default "d42841167fd061d90fddf9a7212a1f9f" if !GDB_TOOLCHAIN_VERSION help - md5sum for the gdb source archive. If the version is provided by - the toolchain and the toolchain is a OSELAS.Toolchain then this - can be left empty and the md5sum from the toolchain ptxconfig is - used. + md5sum for the gdb source archive. + + If the version is provided by the toolchain and its md5sum can be + autodetected (e.g. with newer OSELAS.Toolchains), then the md5sum + from the toolchain is used instead and the value specified here is + ignored. + + Otherwise, specify the md5sum of the tar.xz archive. endif source "generated/debug_tools_gdb.in" endmenu diff --git a/rules/pre/gdb.make b/rules/pre/gdb.make index 31b1975d6..11f48381d 100644 --- a/rules/pre/gdb.make +++ b/rules/pre/gdb.make @@ -11,14 +11,15 @@ SHARED_GDB_MD5 := $(call remove_quotes,$(PTXCONF_GDB_MD5)) ifdef PTXCONF_GDB_TOOLCHAIN_VERSION TOOLCHAIN_CONFIG := $(PTXDIST_PLATFORMDIR)/selected_toolchain/ptxconfig ifneq ($(wildcard $(TOOLCHAIN_CONFIG)),) SHARED_GDB_VERSION := $(call remove_quotes,$(shell ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_VERSION)) -ifeq ($(SHARED_GDB_MD5),) -SHARED_GDB_MD5 := $(call remove_quotes,$(shell ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_MD5)) +TOOLCHAIN_GDB_MD5 := $(call remove_quotes,$(shell ptxd_get_kconfig $(TOOLCHAIN_CONFIG) PTXCONF_CROSS_GDB_MD5)) +ifneq ($(TOOLCHAIN_GDB_MD5),) +SHARED_GDB_MD5 := $(TOOLCHAIN_GDB_MD5) endif else SHARED_GDB_VERSION := $(shell $(PTXCONF_COMPILER_PREFIX)gdb -v | sed -e 's/.* //;q') endif else SHARED_GDB_VERSION := $(call remove_quotes,$(PTXCONF_GDB_VERSION)) -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] gdb-menu: fix indentation
Signed-off-by: Roland Hieber --- rules/gdb-menu.in | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rules/gdb-menu.in b/rules/gdb-menu.in index 907d23942..d8be3fef8 100644 --- a/rules/gdb-menu.in +++ b/rules/gdb-menu.in @@ -4,30 +4,30 @@ menu "gdb " # must be before GDB - used by gdb & gdbserver if GDB || GDBSERVER config GDB_TOOLCHAIN_VERSION - bool - default y if GDBSERVER - prompt "use toolchain gdb version" - help + bool + default y if GDBSERVER + prompt "use toolchain gdb version" + help Use the same version as the gdb in the toolchain to make sure that gdb and gdbserver work correctly. if !GDB_TOOLCHAIN_VERSION config GDB_VERSION - string "gdb version" - default "7.6.1" + string "gdb version" + default "7.6.1" endif config GDB_MD5 string "gdb source md5sum" default "d42841167fd061d90fddf9a7212a1f9f" if !GDB_TOOLCHAIN_VERSION - help + help md5sum for the gdb source archive. If the version is provided by the toolchain and the toolchain is a OSELAS.Toolchain then this can be left empty and the md5sum from the toolchain ptxconfig is used. endif -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
