* [ptxdist] MLO @ 2012-02-21 13:54 Jan Weitzel 2012-02-21 15:09 ` Michael Olbrich 0 siblings, 1 reply; 19+ messages in thread From: Jan Weitzel @ 2012-02-21 13:54 UTC (permalink / raw) To: ptxdist Hello, I am looking for a way to build a MLO (xloader) from barebox sources. How can I reuse the barebox sources? I tried to play with BAREBOX_BUILD_OOT, but didn't got a -build dir. Thanks, Jan -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] MLO 2012-02-21 13:54 [ptxdist] MLO Jan Weitzel @ 2012-02-21 15:09 ` Michael Olbrich 2012-02-21 15:25 ` Jan Weitzel 0 siblings, 1 reply; 19+ messages in thread From: Michael Olbrich @ 2012-02-21 15:09 UTC (permalink / raw) To: ptxdist Hi, On Tue, Feb 21, 2012 at 02:54:57PM +0100, Jan Weitzel wrote: > I am looking for a way to build a MLO (xloader) from barebox sources. > How can I reuse the barebox sources? I tried to play with > BAREBOX_BUILD_OOT, but didn't got a -build dir. You can only use *_OOT this is implemented in ptxdist for the used conf_tool. This only works for autoconf, qmake and cmake right now. You'd create separate rules for the MLO, right? Just reuse the same url, source etc. as barebox but use a different <PKG>_DIR. PTXdist will then extract the same patches into a different directory. This works much better reusing the same source in multiple packages. Michael -- 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-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] MLO 2012-02-21 15:09 ` Michael Olbrich @ 2012-02-21 15:25 ` Jan Weitzel 2012-02-21 16:47 ` Michael Olbrich 0 siblings, 1 reply; 19+ messages in thread From: Jan Weitzel @ 2012-02-21 15:25 UTC (permalink / raw) To: ptxdist Am Dienstag, den 21.02.2012, 16:09 +0100 schrieb Michael Olbrich: > Hi, > > On Tue, Feb 21, 2012 at 02:54:57PM +0100, Jan Weitzel wrote: > > I am looking for a way to build a MLO (xloader) from barebox sources. > > How can I reuse the barebox sources? I tried to play with > > BAREBOX_BUILD_OOT, but didn't got a -build dir. > > You can only use *_OOT this is implemented in ptxdist for the used > conf_tool. This only works for autoconf, qmake and cmake right now. > > You'd create separate rules for the MLO, right? Just reuse the same url, > source etc. as barebox but use a different <PKG>_DIR. PTXdist will then > extract the same patches into a different directory. > This works much better reusing the same source in multiple packages. Ok, is there a way to reuse BAREBOX_SOURCE rules/barebox_mlo.make: BAREBOX_MLO_SOURCE := $(BAREBOX_SOURCE) didn't work. Jan -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] MLO 2012-02-21 15:25 ` Jan Weitzel @ 2012-02-21 16:47 ` Michael Olbrich 2012-02-23 7:31 ` [ptxdist] [RFC] Build MLO from barebox sources Jan Weitzel 0 siblings, 1 reply; 19+ messages in thread From: Michael Olbrich @ 2012-02-21 16:47 UTC (permalink / raw) To: ptxdist On Tue, Feb 21, 2012 at 04:25:59PM +0100, Jan Weitzel wrote: > Am Dienstag, den 21.02.2012, 16:09 +0100 schrieb Michael Olbrich: > > Hi, > > > > On Tue, Feb 21, 2012 at 02:54:57PM +0100, Jan Weitzel wrote: > > > I am looking for a way to build a MLO (xloader) from barebox sources. > > > How can I reuse the barebox sources? I tried to play with > > > BAREBOX_BUILD_OOT, but didn't got a -build dir. > > > > You can only use *_OOT this is implemented in ptxdist for the used > > conf_tool. This only works for autoconf, qmake and cmake right now. > > > > You'd create separate rules for the MLO, right? Just reuse the same url, > > source etc. as barebox but use a different <PKG>_DIR. PTXdist will then > > extract the same patches into a different directory. > > This works much better reusing the same source in multiple packages. > > Ok, is there a way to reuse BAREBOX_SOURCE > > rules/barebox_mlo.make: > BAREBOX_MLO_SOURCE := $(BAREBOX_SOURCE) BAREBOX_MLO_SOURCE = $(BAREBOX_SOURCE) ":=" is resolved immediately even if BAREBOX_SOURCE is not yet defined: FOO := $(BAR) MOO = $(BAR) BAR := Hello MOO is Hello and FOO is empty. Michael -- 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-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* [ptxdist] [RFC] Build MLO from barebox sources 2012-02-21 16:47 ` Michael Olbrich @ 2012-02-23 7:31 ` Jan Weitzel 2012-02-23 7:47 ` Jan Weitzel 2012-02-23 9:54 ` Michael Olbrich 0 siblings, 2 replies; 19+ messages in thread From: Jan Weitzel @ 2012-02-23 7:31 UTC (permalink / raw) To: ptxdist Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG Default config is barebox_mlo.config. Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> --- platforms/barebox_mlo.in | 19 +++++++ rules/barebox_mlo.make | 124 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 0 deletions(-) create mode 100644 platforms/barebox_mlo.in create mode 100644 rules/barebox_mlo.make diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in new file mode 100644 index 0000000..f1e9c78 --- /dev/null +++ b/platforms/barebox_mlo.in @@ -0,0 +1,19 @@ +## SECTION=bootloader + +menuconfig BAREBOX_MLO + prompt "barebox mlo " + bool + depends on BAREBOX + help + Build mlo from barebox sources. + +if BAREBOX_MLO + +config BAREBOX_MLO_CONFIG + prompt "mlo config file" + string + default "barebox_mlo.config" + help + This entry specifies the .config file used to compile mlo. + +endif diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make new file mode 100644 index 0000000..12e8743 --- /dev/null +++ b/rules/barebox_mlo.make @@ -0,0 +1,124 @@ +# -*-makefile-*- +# +# Copyright (C) 2012 Jan Weitzel <j.weitzel@phytec.de> +# based on barebox.make +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_BAREBOX_MLO) += barebox_mlo + +# +# Paths and names +# +BAREBOX_MLO_VERSION = $(BAREBOX_VERSION) +BAREBOX_MLO = barebox_mlo-$(BAREBOX_MLO_VERSION) +BAREBOX_MLO_DIR = $(BUILDDIR)/$(BAREBOX_MLO) +BAREBOX_MLO_SOURCE = $(BAREBOX_SOURCE) +BAREBOX_MLO_LICENSE := GPLv2 + +BAREBOX_MLO_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_BAREBOX_MLO_CONFIG)) + +# ---------------------------------------------------------------------------- +# Get +# ---------------------------------------------------------------------------- +$(STATEDIR)/barebox_mlo.get: $(STATEDIR)/barebox.get + @$(call targetinfo) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Extract +# ---------------------------------------------------------------------------- +$(STATEDIR)/barebox_mlo.extract: + @$(call targetinfo) + @$(call clean, $(BAREBOX_MLO_DIR)) + @mkdir -p $(BAREBOX_MLO_DIR) + @$(call extract, BAREBOX_MLO) + @$(call patchin, BAREBOX, $(BAREBOX_MLO_DIR)) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +BAREBOX_MLO_PATH := PATH=$(CROSS_PATH) +BAREBOX_MLO_ENV := KCONFIG_NOTIMESTAMP=1 +BAREBOX_MLO_MAKEVARS := \ + HOSTCC=$(HOSTCC) \ + ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) + +$(STATEDIR)/barebox_mlo.prepare: $(BAREBOX_MLO_CONFIG) + @$(call targetinfo) + + @echo "Using barebox_mlo config file: $(BAREBOX_MLO_CONFIG)" + @install -m 644 $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config + + @$(call ptx/oldconfig, BAREBOX_MLO) + + @$(call touch) + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +$(STATEDIR)/barebox_mlo.compile: + @$(call targetinfo) + cd $(BAREBOX_MLO_DIR) && $(BAREBOX_MLO_PATH) $(MAKE) $(BAREBOX_MLO_MAKEVARS) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/barebox_mlo.install: + @$(call targetinfo) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/barebox_mlo.targetinstall: + @$(call targetinfo) +#barebox renamed barebox.bin.ift to MLO, so fall back to barebox.bin.ift + @if test -e $(BAREBOX_MLO_DIR)/MLO; then \ + install -D -m644 $(BAREBOX_MLO_DIR)/MLO $(IMAGEDIR)/MLO ; \ + else \ + install -D -m644 $(BAREBOX_MLO_DIR)/barebox.bin.ift $(IMAGEDIR)/MLO ; \ + fi + + @$(call touch) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +$(STATEDIR)/barebox_mlo.clean: + @$(call targetinfo) + @$(call clean_pkg, BAREBOX_MLO) + rm -rf $(IMAGEDIR)/MLO + +# ---------------------------------------------------------------------------- +# oldconfig / menuconfig +# ---------------------------------------------------------------------------- + +barebox_mlo_oldconfig barebox_mlo_menuconfig: $(STATEDIR)/barebox_mlo.extract + @if test -e $(BAREBOX_MLO_CONFIG); then \ + cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \ + fi + cd $(BAREBOX_MLO_DIR) && \ + $(BAREBOX_MLO_PATH) $(BAREBOX_MLO_ENV) $(MAKE) $(BAREBOX_MLO_MAKEVARS) $(subst barebox_mlo_,,$@) + @if cmp -s $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); then \ + echo "barebox_mlo configuration unchanged"; \ + else \ + cp $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); \ + fi + +# vim: syntax=make -- 1.7.0.4 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [RFC] Build MLO from barebox sources 2012-02-23 7:31 ` [ptxdist] [RFC] Build MLO from barebox sources Jan Weitzel @ 2012-02-23 7:47 ` Jan Weitzel 2012-02-23 9:40 ` Michael Olbrich 2012-02-23 9:54 ` Michael Olbrich 1 sibling, 1 reply; 19+ messages in thread From: Jan Weitzel @ 2012-02-23 7:47 UTC (permalink / raw) To: ptxdist Am Donnerstag, den 23.02.2012, 08:31 +0100 schrieb Jan Weitzel: > Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG > Default config is barebox_mlo.config. > > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> > --- > platforms/barebox_mlo.in | 19 +++++++ > rules/barebox_mlo.make | 124 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 143 insertions(+), 0 deletions(-) > create mode 100644 platforms/barebox_mlo.in > create mode 100644 rules/barebox_mlo.make > > diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in > new file mode 100644 > index 0000000..f1e9c78 > --- /dev/null > +++ b/platforms/barebox_mlo.in > @@ -0,0 +1,19 @@ > +## SECTION=bootloader > + > +menuconfig BAREBOX_MLO > + prompt "barebox mlo " > + bool > + depends on BAREBOX > + help > + Build mlo from barebox sources. > + > +if BAREBOX_MLO > + > +config BAREBOX_MLO_CONFIG > + prompt "mlo config file" > + string > + default "barebox_mlo.config" > + help > + This entry specifies the .config file used to compile mlo. > + > +endif > diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make > new file mode 100644 > index 0000000..12e8743 > --- /dev/null > +++ b/rules/barebox_mlo.make > @@ -0,0 +1,124 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2012 Jan Weitzel <j.weitzel@phytec.de> > +# based on barebox.make > +# > +# See CREDITS for details about who has contributed to this project. > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_BAREBOX_MLO) += barebox_mlo > + > +# > +# Paths and names > +# > +BAREBOX_MLO_VERSION = $(BAREBOX_VERSION) > +BAREBOX_MLO = barebox_mlo-$(BAREBOX_MLO_VERSION) > +BAREBOX_MLO_DIR = $(BUILDDIR)/$(BAREBOX_MLO) > +BAREBOX_MLO_SOURCE = $(BAREBOX_SOURCE) > +BAREBOX_MLO_LICENSE := GPLv2 > + > +BAREBOX_MLO_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_BAREBOX_MLO_CONFIG)) > + > +# ---------------------------------------------------------------------------- > +# Get > +# ---------------------------------------------------------------------------- > +$(STATEDIR)/barebox_mlo.get: $(STATEDIR)/barebox.get > + @$(call targetinfo) > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Extract > +# ---------------------------------------------------------------------------- > +$(STATEDIR)/barebox_mlo.extract: > + @$(call targetinfo) > + @$(call clean, $(BAREBOX_MLO_DIR)) > + @mkdir -p $(BAREBOX_MLO_DIR) > + @$(call extract, BAREBOX_MLO) > + @$(call patchin, BAREBOX, $(BAREBOX_MLO_DIR)) I saw this is deprecated, is there an other way to get the BAREBOX patchstack? With @$(call patchin, BAREBOX_MLO) I got: extract: pkg_src=/home/ptxdist_src/barebox-2011.12.0.tar.bz2 extract: pkg_extract_dir=BSP-Phytec-phyCARD-XL2/platform-phyCARD-XL2/build-target/barebox_mlo-2011.12.0 patchin: no patches found > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +BAREBOX_MLO_PATH := PATH=$(CROSS_PATH) > +BAREBOX_MLO_ENV := KCONFIG_NOTIMESTAMP=1 > +BAREBOX_MLO_MAKEVARS := \ > + HOSTCC=$(HOSTCC) \ > + ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ > + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) > + > +$(STATEDIR)/barebox_mlo.prepare: $(BAREBOX_MLO_CONFIG) > + @$(call targetinfo) > + > + @echo "Using barebox_mlo config file: $(BAREBOX_MLO_CONFIG)" > + @install -m 644 $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config > + > + @$(call ptx/oldconfig, BAREBOX_MLO) > + > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Compile > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.compile: > + @$(call targetinfo) > + cd $(BAREBOX_MLO_DIR) && $(BAREBOX_MLO_PATH) $(MAKE) $(BAREBOX_MLO_MAKEVARS) > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.install: > + @$(call targetinfo) > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.targetinstall: > + @$(call targetinfo) > +#barebox renamed barebox.bin.ift to MLO, so fall back to barebox.bin.ift > + @if test -e $(BAREBOX_MLO_DIR)/MLO; then \ > + install -D -m644 $(BAREBOX_MLO_DIR)/MLO $(IMAGEDIR)/MLO ; \ > + else \ > + install -D -m644 $(BAREBOX_MLO_DIR)/barebox.bin.ift $(IMAGEDIR)/MLO ; \ > + fi > + > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Clean > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.clean: > + @$(call targetinfo) > + @$(call clean_pkg, BAREBOX_MLO) > + rm -rf $(IMAGEDIR)/MLO > + > +# ---------------------------------------------------------------------------- > +# oldconfig / menuconfig > +# ---------------------------------------------------------------------------- > + > +barebox_mlo_oldconfig barebox_mlo_menuconfig: $(STATEDIR)/barebox_mlo.extract > + @if test -e $(BAREBOX_MLO_CONFIG); then \ > + cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \ > + fi > + cd $(BAREBOX_MLO_DIR) && \ > + $(BAREBOX_MLO_PATH) $(BAREBOX_MLO_ENV) $(MAKE) $(BAREBOX_MLO_MAKEVARS) $(subst barebox_mlo_,,$@) > + @if cmp -s $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); then \ > + echo "barebox_mlo configuration unchanged"; \ > + else \ > + cp $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); \ > + fi > + > +# vim: syntax=make -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [RFC] Build MLO from barebox sources 2012-02-23 7:47 ` Jan Weitzel @ 2012-02-23 9:40 ` Michael Olbrich 2012-02-23 16:46 ` Jan Weitzel 0 siblings, 1 reply; 19+ messages in thread From: Michael Olbrich @ 2012-02-23 9:40 UTC (permalink / raw) To: ptxdist On Thu, Feb 23, 2012 at 08:47:39AM +0100, Jan Weitzel wrote: > Am Donnerstag, den 23.02.2012, 08:31 +0100 schrieb Jan Weitzel: [...] > > +# ---------------------------------------------------------------------------- > > +# Extract > > +# ---------------------------------------------------------------------------- > > +$(STATEDIR)/barebox_mlo.extract: > > + @$(call targetinfo) > > + @$(call clean, $(BAREBOX_MLO_DIR)) > > + @mkdir -p $(BAREBOX_MLO_DIR) > > + @$(call extract, BAREBOX_MLO) > > + @$(call patchin, BAREBOX, $(BAREBOX_MLO_DIR)) > I saw this is deprecated, is there an other way to get the BAREBOX > patchstack? > With @$(call patchin, BAREBOX_MLO) I got: > > extract: pkg_src=/home/ptxdist_src/barebox-2011.12.0.tar.bz2 > extract: > pkg_extract_dir=BSP-Phytec-phyCARD-XL2/platform-phyCARD-XL2/build-target/barebox_mlo-2011.12.0 > patchin: no patches found BAREBOX_MLO_VERSION = $(BAREBOX_VERSION) BAREBOX_MLO = $(BAREBOX) BAREBOX_MLO_DIR = $(BUILDDIR)/barebox_mlo-$(BAREBOX_MLO_VERSION) I think. Then you can remove the extract stage. Michael -- 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-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [RFC] Build MLO from barebox sources 2012-02-23 9:40 ` Michael Olbrich @ 2012-02-23 16:46 ` Jan Weitzel 0 siblings, 0 replies; 19+ messages in thread From: Jan Weitzel @ 2012-02-23 16:46 UTC (permalink / raw) To: ptxdist Am Donnerstag, den 23.02.2012, 10:40 +0100 schrieb Michael Olbrich: > On Thu, Feb 23, 2012 at 08:47:39AM +0100, Jan Weitzel wrote: > > Am Donnerstag, den 23.02.2012, 08:31 +0100 schrieb Jan Weitzel: > [...] > > > +# ---------------------------------------------------------------------------- > > > +# Extract > > > +# ---------------------------------------------------------------------------- > > > +$(STATEDIR)/barebox_mlo.extract: > > > + @$(call targetinfo) > > > + @$(call clean, $(BAREBOX_MLO_DIR)) > > > + @mkdir -p $(BAREBOX_MLO_DIR) > > > + @$(call extract, BAREBOX_MLO) > > > + @$(call patchin, BAREBOX, $(BAREBOX_MLO_DIR)) > > I saw this is deprecated, is there an other way to get the BAREBOX > > patchstack? > > With @$(call patchin, BAREBOX_MLO) I got: > > > > extract: pkg_src=/home/ptxdist_src/barebox-2011.12.0.tar.bz2 > > extract:. > > pkg_extract_dir=BSP-Phytec-phyCARD-XL2/platform-phyCARD-XL2/build-target/barebox_mlo-2011.12.0 > > patchin: no patches found > > BAREBOX_MLO_VERSION = $(BAREBOX_VERSION) > BAREBOX_MLO = $(BAREBOX) > BAREBOX_MLO_DIR = $(BUILDDIR)/barebox_mlo-$(BAREBOX_MLO_VERSION) > > I think. Then you can remove the extract stage. > > Michael Thank you very much. Feel free to put your name into the rule ;) Jan > -- > 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-5555 | > -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [RFC] Build MLO from barebox sources 2012-02-23 7:31 ` [ptxdist] [RFC] Build MLO from barebox sources Jan Weitzel 2012-02-23 7:47 ` Jan Weitzel @ 2012-02-23 9:54 ` Michael Olbrich 2012-02-23 16:40 ` [ptxdist] [PATCH] " Jan Weitzel 1 sibling, 1 reply; 19+ messages in thread From: Michael Olbrich @ 2012-02-23 9:54 UTC (permalink / raw) To: ptxdist On Thu, Feb 23, 2012 at 08:31:12AM +0100, Jan Weitzel wrote: > Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG > Default config is barebox_mlo.config. > > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> > --- > platforms/barebox_mlo.in | 19 +++++++ > rules/barebox_mlo.make | 124 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 143 insertions(+), 0 deletions(-) > create mode 100644 platforms/barebox_mlo.in > create mode 100644 rules/barebox_mlo.make > > diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in > new file mode 100644 > index 0000000..f1e9c78 > --- /dev/null > +++ b/platforms/barebox_mlo.in > @@ -0,0 +1,19 @@ > +## SECTION=bootloader > + > +menuconfig BAREBOX_MLO > + prompt "barebox mlo " > + bool > + depends on BAREBOX > + help > + Build mlo from barebox sources. > + > +if BAREBOX_MLO > + > +config BAREBOX_MLO_CONFIG > + prompt "mlo config file" > + string > + default "barebox_mlo.config" > + help > + This entry specifies the .config file used to compile mlo. > + > +endif > diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make > new file mode 100644 > index 0000000..12e8743 > --- /dev/null > +++ b/rules/barebox_mlo.make > @@ -0,0 +1,124 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2012 Jan Weitzel <j.weitzel@phytec.de> > +# based on barebox.make > +# > +# See CREDITS for details about who has contributed to this project. > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_BAREBOX_MLO) += barebox_mlo > + > +# > +# Paths and names > +# > +BAREBOX_MLO_VERSION = $(BAREBOX_VERSION) > +BAREBOX_MLO = barebox_mlo-$(BAREBOX_MLO_VERSION) > +BAREBOX_MLO_DIR = $(BUILDDIR)/$(BAREBOX_MLO) > +BAREBOX_MLO_SOURCE = $(BAREBOX_SOURCE) > +BAREBOX_MLO_LICENSE := GPLv2 > + > +BAREBOX_MLO_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_BAREBOX_MLO_CONFIG)) > + > +# ---------------------------------------------------------------------------- > +# Get > +# ---------------------------------------------------------------------------- > +$(STATEDIR)/barebox_mlo.get: $(STATEDIR)/barebox.get > + @$(call targetinfo) > + @$(call touch) No need for a get stage. The implicit rules and dependencies can handle multiple packages with the same source. > + > +# ---------------------------------------------------------------------------- > +# Extract > +# ---------------------------------------------------------------------------- > +$(STATEDIR)/barebox_mlo.extract: > + @$(call targetinfo) > + @$(call clean, $(BAREBOX_MLO_DIR)) > + @mkdir -p $(BAREBOX_MLO_DIR) > + @$(call extract, BAREBOX_MLO) > + @$(call patchin, BAREBOX, $(BAREBOX_MLO_DIR)) > + @$(call touch) see my other mail. > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > + > +BAREBOX_MLO_PATH := PATH=$(CROSS_PATH) not needed. > +BAREBOX_MLO_ENV := KCONFIG_NOTIMESTAMP=1 BAREBOX_MLO_CONF_ENV > +BAREBOX_MLO_MAKEVARS := \ > + HOSTCC=$(HOSTCC) \ > + ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ > + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) use BAREBOX_MLO_CONF_OPT here. > +$(STATEDIR)/barebox_mlo.prepare: $(BAREBOX_MLO_CONFIG) > + @$(call targetinfo) > + > + @echo "Using barebox_mlo config file: $(BAREBOX_MLO_CONFIG)" > + @install -m 644 $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config > + > + @$(call ptx/oldconfig, BAREBOX_MLO) > + > + @$(call touch) Please try removing the prepare stage. There is a default oldconfig prepare stage that is used if <PKG>_CONF_TOOL=kconfig or <PKG>_CONFIG is set. > + > +# ---------------------------------------------------------------------------- > +# Compile > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.compile: > + @$(call targetinfo) > + cd $(BAREBOX_MLO_DIR) && $(BAREBOX_MLO_PATH) $(MAKE) $(BAREBOX_MLO_MAKEVARS) > + @$(call touch) The default stage should do the right thing here too. Maybe with BAREBOX_MLO_MAKE_OPT := $(BAREBOX_MLO_CONF_OPT) > + > +# ---------------------------------------------------------------------------- > +# Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.install: > + @$(call targetinfo) > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.targetinstall: > + @$(call targetinfo) > +#barebox renamed barebox.bin.ift to MLO, so fall back to barebox.bin.ift # # comment > + @if test -e $(BAREBOX_MLO_DIR)/MLO; then \ > + install -D -m644 $(BAREBOX_MLO_DIR)/MLO $(IMAGEDIR)/MLO ; \ > + else \ > + install -D -m644 $(BAREBOX_MLO_DIR)/barebox.bin.ift $(IMAGEDIR)/MLO ; \ > + fi @ptxd_get_path "$(BAREBOX_MLO_DIR)/MLO" \ "$(BAREBOX_MLO_DIR)/barebox.bin.ift" && \ install -D -m644 "${ptxd_reply}" "$(IMAGEDIR)/MLO" > + > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Clean > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.clean: > + @$(call targetinfo) > + @$(call clean_pkg, BAREBOX_MLO) > + rm -rf $(IMAGEDIR)/MLO > + > +# ---------------------------------------------------------------------------- > +# oldconfig / menuconfig > +# ---------------------------------------------------------------------------- > + > +barebox_mlo_oldconfig barebox_mlo_menuconfig: $(STATEDIR)/barebox_mlo.extract > + @if test -e $(BAREBOX_MLO_CONFIG); then \ > + cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \ > + fi > + cd $(BAREBOX_MLO_DIR) && \ > + $(BAREBOX_MLO_PATH) $(BAREBOX_MLO_ENV) $(MAKE) $(BAREBOX_MLO_MAKEVARS) $(subst barebox_mlo_,,$@) > + @if cmp -s $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); then \ > + echo "barebox_mlo configuration unchanged"; \ > + else \ > + cp $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); \ > + fi At some point I'll find a way to make this generic... Michael > + > +# vim: syntax=make > -- > 1.7.0.4 > > > -- > 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-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* [ptxdist] [PATCH] Build MLO from barebox sources 2012-02-23 9:54 ` Michael Olbrich @ 2012-02-23 16:40 ` Jan Weitzel 2012-03-08 13:23 ` Michael Olbrich 0 siblings, 1 reply; 19+ messages in thread From: Jan Weitzel @ 2012-02-23 16:40 UTC (permalink / raw) To: ptxdist Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG Default config is barebox_mlo.config. Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> --- platforms/barebox_mlo.in | 19 ++++++++++ rules/barebox_mlo.make | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 0 deletions(-) create mode 100644 platforms/barebox_mlo.in create mode 100644 rules/barebox_mlo.make diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in new file mode 100644 index 0000000..f1e9c78 --- /dev/null +++ b/platforms/barebox_mlo.in @@ -0,0 +1,19 @@ +## SECTION=bootloader + +menuconfig BAREBOX_MLO + prompt "barebox mlo " + bool + depends on BAREBOX + help + Build mlo from barebox sources. + +if BAREBOX_MLO + +config BAREBOX_MLO_CONFIG + prompt "mlo config file" + string + default "barebox_mlo.config" + help + This entry specifies the .config file used to compile mlo. + +endif diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make new file mode 100644 index 0000000..0efab3b --- /dev/null +++ b/rules/barebox_mlo.make @@ -0,0 +1,88 @@ +# -*-makefile-*- +# +# Copyright (C) 2012 Jan Weitzel <j.weitzel@phytec.de> +# +# See CREDITS for details about who has contributed to this project. +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_BAREBOX_MLO) += barebox_mlo + +# +# Paths and names +# +BAREBOX_MLO_VERSION = $(BAREBOX_VERSION) +BAREBOX_MLO_MD5 = $(BAREBOX_MD5) +BAREBOX_MLO = $(BAREBOX) +BAREBOX_MLO_DIR = $(BUILDDIR)/barebox_mlo-$(BAREBOX_MLO_VERSION) +BAREBOX_MLO_SOURCE = $(BAREBOX_SOURCE) +BAREBOX_MLO_LICENSE := GPLv2 + +BAREBOX_MLO_CONFIG := $(call remove_quotes, \ + $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_BAREBOX_MLO_CONFIG)) + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- +BAREBOX_MLO_CONF_ENV := KCONFIG_NOTIMESTAMP=1 +BAREBOX_MLO_CONF_TOOL := kconfig +BAREBOX_MLO_CONF_OPT := \ + HOSTCC=$(HOSTCC) \ + ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) + +BAREBOX_MLO_MAKE_OPT := $(BAREBOX_MLO_CONF_OPT) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/barebox_mlo.install: + @$(call targetinfo) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/barebox_mlo.targetinstall: + @$(call targetinfo) +# #barebox renamed barebox.bin.ift to MLO, so fall back to barebox.bin.ift + @ptxd_get_path "$(BAREBOX_MLO_DIR)/MLO" \ + "$(BAREBOX_MLO_DIR)/barebox.bin.ift" && \ + install -D -m644 "$${ptxd_reply}" "$(IMAGEDIR)/MLO" + + @$(call touch) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +$(STATEDIR)/barebox_mlo.clean: + @$(call targetinfo) + @$(call clean_pkg, BAREBOX_MLO) + rm -rf $(IMAGEDIR)/MLO + +# ---------------------------------------------------------------------------- +# oldconfig / menuconfig +# ---------------------------------------------------------------------------- + +barebox_mlo_oldconfig barebox_mlo_menuconfig: $(STATEDIR)/barebox_mlo.extract + @if test -e $(BAREBOX_MLO_CONFIG); then \ + cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \ + fi + cd $(BAREBOX_MLO_DIR) && \ + $(BAREBOX_MLO_PATH) $(BAREBOX_MLO_ENV) $(MAKE) \ + $(BAREBOX_MLO_MAKEVARS) $(subst barebox_mlo_,,$@) + @if cmp -s $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); then \ + echo "barebox_mlo configuration unchanged"; \ + else \ + cp $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); \ + fi + +# vim: syntax=make -- 1.7.0.4 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [PATCH] Build MLO from barebox sources 2012-02-23 16:40 ` [ptxdist] [PATCH] " Jan Weitzel @ 2012-03-08 13:23 ` Michael Olbrich 2012-03-09 10:02 ` Jan Weitzel 0 siblings, 1 reply; 19+ messages in thread From: Michael Olbrich @ 2012-03-08 13:23 UTC (permalink / raw) To: ptxdist On Thu, Feb 23, 2012 at 05:40:51PM +0100, Jan Weitzel wrote: > Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG > Default config is barebox_mlo.config. Applied. I did some more modifications in another commit. Please check that it still works for you. Michael > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> > --- > platforms/barebox_mlo.in | 19 ++++++++++ > rules/barebox_mlo.make | 88 ++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 107 insertions(+), 0 deletions(-) > create mode 100644 platforms/barebox_mlo.in > create mode 100644 rules/barebox_mlo.make > > diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in > new file mode 100644 > index 0000000..f1e9c78 > --- /dev/null > +++ b/platforms/barebox_mlo.in > @@ -0,0 +1,19 @@ > +## SECTION=bootloader > + > +menuconfig BAREBOX_MLO > + prompt "barebox mlo " > + bool > + depends on BAREBOX > + help > + Build mlo from barebox sources. > + > +if BAREBOX_MLO > + > +config BAREBOX_MLO_CONFIG > + prompt "mlo config file" > + string > + default "barebox_mlo.config" > + help > + This entry specifies the .config file used to compile mlo. > + > +endif > diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make > new file mode 100644 > index 0000000..0efab3b > --- /dev/null > +++ b/rules/barebox_mlo.make > @@ -0,0 +1,88 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2012 Jan Weitzel <j.weitzel@phytec.de> > +# > +# See CREDITS for details about who has contributed to this project. > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_BAREBOX_MLO) += barebox_mlo > + > +# > +# Paths and names > +# > +BAREBOX_MLO_VERSION = $(BAREBOX_VERSION) > +BAREBOX_MLO_MD5 = $(BAREBOX_MD5) > +BAREBOX_MLO = $(BAREBOX) > +BAREBOX_MLO_DIR = $(BUILDDIR)/barebox_mlo-$(BAREBOX_MLO_VERSION) > +BAREBOX_MLO_SOURCE = $(BAREBOX_SOURCE) > +BAREBOX_MLO_LICENSE := GPLv2 > + > +BAREBOX_MLO_CONFIG := $(call remove_quotes, \ > + $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_BAREBOX_MLO_CONFIG)) > + > +# ---------------------------------------------------------------------------- > +# Prepare > +# ---------------------------------------------------------------------------- > +BAREBOX_MLO_CONF_ENV := KCONFIG_NOTIMESTAMP=1 > +BAREBOX_MLO_CONF_TOOL := kconfig > +BAREBOX_MLO_CONF_OPT := \ > + HOSTCC=$(HOSTCC) \ > + ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ > + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) > + > +BAREBOX_MLO_MAKE_OPT := $(BAREBOX_MLO_CONF_OPT) > + > +# ---------------------------------------------------------------------------- > +# Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.install: > + @$(call targetinfo) > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Target-Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.targetinstall: > + @$(call targetinfo) > +# #barebox renamed barebox.bin.ift to MLO, so fall back to barebox.bin.ift > + @ptxd_get_path "$(BAREBOX_MLO_DIR)/MLO" \ > + "$(BAREBOX_MLO_DIR)/barebox.bin.ift" && \ > + install -D -m644 "$${ptxd_reply}" "$(IMAGEDIR)/MLO" > + > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > +# Clean > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/barebox_mlo.clean: > + @$(call targetinfo) > + @$(call clean_pkg, BAREBOX_MLO) > + rm -rf $(IMAGEDIR)/MLO > + > +# ---------------------------------------------------------------------------- > +# oldconfig / menuconfig > +# ---------------------------------------------------------------------------- > + > +barebox_mlo_oldconfig barebox_mlo_menuconfig: $(STATEDIR)/barebox_mlo.extract > + @if test -e $(BAREBOX_MLO_CONFIG); then \ > + cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \ > + fi > + cd $(BAREBOX_MLO_DIR) && \ > + $(BAREBOX_MLO_PATH) $(BAREBOX_MLO_ENV) $(MAKE) \ > + $(BAREBOX_MLO_MAKEVARS) $(subst barebox_mlo_,,$@) > + @if cmp -s $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); then \ > + echo "barebox_mlo configuration unchanged"; \ > + else \ > + cp $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); \ > + fi > + > +# vim: syntax=make > -- > 1.7.0.4 > > > -- > 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-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [PATCH] Build MLO from barebox sources 2012-03-08 13:23 ` Michael Olbrich @ 2012-03-09 10:02 ` Jan Weitzel 2012-03-09 10:03 ` [ptxdist] [PATCH] barebox_mlo: fix resolving BAREBOX_MLO_ Jan Weitzel 2012-03-09 12:47 ` [ptxdist] [PATCH] Build MLO from barebox sources Michael Olbrich 0 siblings, 2 replies; 19+ messages in thread From: Jan Weitzel @ 2012-03-09 10:02 UTC (permalink / raw) To: ptxdist Am Donnerstag, den 08.03.2012, 14:23 +0100 schrieb Michael Olbrich: > On Thu, Feb 23, 2012 at 05:40:51PM +0100, Jan Weitzel wrote: > > Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG > > Default config is barebox_mlo.config. > > Applied. > I did some more modifications in another commit. Please check that it still > works for you. No, version is missing in url. Fixed by a hint from you ;) I am going to send the patch. ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo ------------------------ target: barebox-.tar.bz2 ------------------------ --2012-03-09 10:41:41-- http://www.barebox.org/download/barebox-.tar.bz2 Resolving www.barebox.org... 78.47.139.85, 2a01:4f8:121:2:5054:ff:feaf:fc62 Connecting to www.barebox.org|78.47.139.85|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2012-03-09 10:41:41 ERROR 404: Not Found. --2012-03-09 10:41:41-- http://www.pengutronix.de/software/ptxdist/temporary-src/barebox-.tar.bz2 Resolving www.pengutronix.de... 78.47.139.85, 2a01:4f8:121:2:5054:ff:feaf:fc62 Connecting to www.pengutronix.de|78.47.139.85|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2012-03-09 10:41:41 ERROR 404: Not Found. Could not download packet URL: http://www.barebox.org/download/barebox-.tar.bz2 make: *** [/home/ptxdist_src/barebox-.tar.bz2] Error 1 grep BAREBOX selected_platformconfig PTXCONF_BAREBOX=y PTXCONF_BAREBOX_VERSION="2011.12.0" PTXCONF_BAREBOX_MD5="a2f7725dfb5b15b2f3275663d663ab3b" PTXCONF_BAREBOX_CONFIG="barebox.config" PTXCONF_BAREBOX_ARCH_STRING="arm" PTXCONF_BAREBOX_EXTRA_ENV=y PTXCONF_BAREBOX_EXTRA_ENV_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-defaultenv" PTXCONF_BAREBOX_MLO=y PTXCONF_BAREBOX_MLO_VERSION="${BAREBOX_VERSION}" PTXCONF_BAREBOX_MLO_MD5="${BAREBOX_MD5}" PTXCONF_BAREBOX_MLO_ARCH_STRING="arm" PTXCONF_BAREBOX_MLO_CONFIG="barebox_mlo.config" # PTXCONF_BAREBOX_BBENV is not set ~/git/ptxdist/bin/ptxdist print BAREBOX_MLO_URL http://www.barebox.org/download/barebox-.tar.bz2 > Michael > > > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> > > --- > > platforms/barebox_mlo.in | 19 ++++++++++ > > rules/barebox_mlo.make | 88 ++++++++++++++++++++++++++++++++++++++++++++++ > > 2 files changed, 107 insertions(+), 0 deletions(-) > > create mode 100644 platforms/barebox_mlo.in > > create mode 100644 rules/barebox_mlo.make > > > > diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in > > new file mode 100644 > > index 0000000..f1e9c78 > > --- /dev/null > > +++ b/platforms/barebox_mlo.in > > @@ -0,0 +1,19 @@ > > +## SECTION=bootloader > > + > > +menuconfig BAREBOX_MLO > > + prompt "barebox mlo " > > + bool > > + depends on BAREBOX > > + help > > + Build mlo from barebox sources. > > + > > +if BAREBOX_MLO > > + > > +config BAREBOX_MLO_CONFIG > > + prompt "mlo config file" > > + string > > + default "barebox_mlo.config" > > + help > > + This entry specifies the .config file used to compile mlo. > > + > > +endif > > diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make > > new file mode 100644 > > index 0000000..0efab3b > > --- /dev/null > > +++ b/rules/barebox_mlo.make > > @@ -0,0 +1,88 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2012 Jan Weitzel <j.weitzel@phytec.de> > > +# > > +# See CREDITS for details about who has contributed to this project. > > +# > > +# For further information about the PTXdist project and license conditions > > +# see the README file. > > +# > > + > > +# > > +# We provide this package > > +# > > +PACKAGES-$(PTXCONF_BAREBOX_MLO) += barebox_mlo > > + > > +# > > +# Paths and names > > +# > > +BAREBOX_MLO_VERSION = $(BAREBOX_VERSION) > > +BAREBOX_MLO_MD5 = $(BAREBOX_MD5) > > +BAREBOX_MLO = $(BAREBOX) > > +BAREBOX_MLO_DIR = $(BUILDDIR)/barebox_mlo-$(BAREBOX_MLO_VERSION) > > +BAREBOX_MLO_SOURCE = $(BAREBOX_SOURCE) > > +BAREBOX_MLO_LICENSE := GPLv2 > > + > > +BAREBOX_MLO_CONFIG := $(call remove_quotes, \ > > + $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_BAREBOX_MLO_CONFIG)) > > + > > +# ---------------------------------------------------------------------------- > > +# Prepare > > +# ---------------------------------------------------------------------------- > > +BAREBOX_MLO_CONF_ENV := KCONFIG_NOTIMESTAMP=1 > > +BAREBOX_MLO_CONF_TOOL := kconfig > > +BAREBOX_MLO_CONF_OPT := \ > > + HOSTCC=$(HOSTCC) \ > > + ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ > > + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) > > + > > +BAREBOX_MLO_MAKE_OPT := $(BAREBOX_MLO_CONF_OPT) > > + > > +# ---------------------------------------------------------------------------- > > +# Install > > +# ---------------------------------------------------------------------------- > > + > > +$(STATEDIR)/barebox_mlo.install: > > + @$(call targetinfo) > > + @$(call touch) > > + > > +# ---------------------------------------------------------------------------- > > +# Target-Install > > +# ---------------------------------------------------------------------------- > > + > > +$(STATEDIR)/barebox_mlo.targetinstall: > > + @$(call targetinfo) > > +# #barebox renamed barebox.bin.ift to MLO, so fall back to barebox.bin.ift > > + @ptxd_get_path "$(BAREBOX_MLO_DIR)/MLO" \ > > + "$(BAREBOX_MLO_DIR)/barebox.bin.ift" && \ > > + install -D -m644 "$${ptxd_reply}" "$(IMAGEDIR)/MLO" > > + > > + @$(call touch) > > + > > +# ---------------------------------------------------------------------------- > > +# Clean > > +# ---------------------------------------------------------------------------- > > + > > +$(STATEDIR)/barebox_mlo.clean: > > + @$(call targetinfo) > > + @$(call clean_pkg, BAREBOX_MLO) > > + rm -rf $(IMAGEDIR)/MLO > > + > > +# ---------------------------------------------------------------------------- > > +# oldconfig / menuconfig > > +# ---------------------------------------------------------------------------- > > + > > +barebox_mlo_oldconfig barebox_mlo_menuconfig: $(STATEDIR)/barebox_mlo.extract > > + @if test -e $(BAREBOX_MLO_CONFIG); then \ > > + cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \ > > + fi > > + cd $(BAREBOX_MLO_DIR) && \ > > + $(BAREBOX_MLO_PATH) $(BAREBOX_MLO_ENV) $(MAKE) \ > > + $(BAREBOX_MLO_MAKEVARS) $(subst barebox_mlo_,,$@) > > + @if cmp -s $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); then \ > > + echo "barebox_mlo configuration unchanged"; \ > > + else \ > > + cp $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); \ > > + fi > > + > > +# vim: syntax=make > > -- > > 1.7.0.4 > > > > > > -- > > 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-5555 | > -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* [ptxdist] [PATCH] barebox_mlo: fix resolving BAREBOX_MLO_ 2012-03-09 10:02 ` Jan Weitzel @ 2012-03-09 10:03 ` Jan Weitzel 2012-03-09 12:47 ` [ptxdist] [PATCH] Build MLO from barebox sources Michael Olbrich 1 sibling, 0 replies; 19+ messages in thread From: Jan Weitzel @ 2012-03-09 10:03 UTC (permalink / raw) To: ptxdist BAREBOX_MLO_MD5 and BAREBOX_MLO_URL are not correct resolved. Fix it by using "=" instead of ":=" Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> --- rules/barebox_mlo.make | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make index 018f273..fd860b6 100644 --- a/rules/barebox_mlo.make +++ b/rules/barebox_mlo.make @@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_BAREBOX_MLO) += barebox_mlo # # Paths and names # -BAREBOX_MLO_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_MLO_VERSION)) -BAREBOX_MLO_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_MLO_MD5)) -BAREBOX_MLO := barebox-$(BAREBOX_MLO_VERSION) +BAREBOX_MLO_VERSION = $(call remove_quotes,$(PTXCONF_BAREBOX_MLO_VERSION)) +BAREBOX_MLO_MD5 = $(call remove_quotes,$(PTXCONF_BAREBOX_MLO_MD5)) +BAREBOX_MLO = barebox-$(BAREBOX_MLO_VERSION) BAREBOX_MLO_URL = http://www.barebox.org/download/$(BAREBOX_MLO).$(BAREBOX_SUFFIX) BAREBOX_MLO_DIR := $(BUILDDIR)/barebox_mlo-$(BAREBOX_MLO_VERSION) BAREBOX_MLO_SOURCE = $(SRCDIR)/$(BAREBOX_MLO).$(BAREBOX_SUFFIX) -- 1.7.0.4 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [PATCH] Build MLO from barebox sources 2012-03-09 10:02 ` Jan Weitzel 2012-03-09 10:03 ` [ptxdist] [PATCH] barebox_mlo: fix resolving BAREBOX_MLO_ Jan Weitzel @ 2012-03-09 12:47 ` Michael Olbrich 2012-03-09 14:23 ` Jan Weitzel 1 sibling, 1 reply; 19+ messages in thread From: Michael Olbrich @ 2012-03-09 12:47 UTC (permalink / raw) To: ptxdist On Fri, Mar 09, 2012 at 11:02:44AM +0100, Jan Weitzel wrote: > Am Donnerstag, den 08.03.2012, 14:23 +0100 schrieb Michael Olbrich: > > On Thu, Feb 23, 2012 at 05:40:51PM +0100, Jan Weitzel wrote: > > > Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG > > > Default config is barebox_mlo.config. > > > > Applied. > > I did some more modifications in another commit. Please check that it still > > works for you. > No, version is missing in url. Fixed by a hint from you ;) > I am going to send the patch. > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo Did you run "ptxdist oldconfig" first? If barebox is enabled the PTXCONF_BAREBOX_MLO_VERSION defaults to PTXCONF_BAREBOX_VERSION. However without oldconfig this will not be set. Michael > ------------------------ > target: barebox-.tar.bz2 > ------------------------ > > --2012-03-09 10:41:41-- > http://www.barebox.org/download/barebox-.tar.bz2 > Resolving www.barebox.org... 78.47.139.85, > 2a01:4f8:121:2:5054:ff:feaf:fc62 > Connecting to www.barebox.org|78.47.139.85|:80... connected. > HTTP request sent, awaiting response... 404 Not Found > 2012-03-09 10:41:41 ERROR 404: Not Found. > > --2012-03-09 10:41:41-- > http://www.pengutronix.de/software/ptxdist/temporary-src/barebox-.tar.bz2 > Resolving www.pengutronix.de... 78.47.139.85, > 2a01:4f8:121:2:5054:ff:feaf:fc62 > Connecting to www.pengutronix.de|78.47.139.85|:80... connected. > HTTP request sent, awaiting response... 404 Not Found > 2012-03-09 10:41:41 ERROR 404: Not Found. > > > Could not download packet > URL: http://www.barebox.org/download/barebox-.tar.bz2 > > make: *** [/home/ptxdist_src/barebox-.tar.bz2] Error 1 > > > > > > > grep BAREBOX selected_platformconfig > PTXCONF_BAREBOX=y > PTXCONF_BAREBOX_VERSION="2011.12.0" > PTXCONF_BAREBOX_MD5="a2f7725dfb5b15b2f3275663d663ab3b" > PTXCONF_BAREBOX_CONFIG="barebox.config" > PTXCONF_BAREBOX_ARCH_STRING="arm" > PTXCONF_BAREBOX_EXTRA_ENV=y > PTXCONF_BAREBOX_EXTRA_ENV_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-defaultenv" > PTXCONF_BAREBOX_MLO=y > PTXCONF_BAREBOX_MLO_VERSION="${BAREBOX_VERSION}" > PTXCONF_BAREBOX_MLO_MD5="${BAREBOX_MD5}" > PTXCONF_BAREBOX_MLO_ARCH_STRING="arm" > PTXCONF_BAREBOX_MLO_CONFIG="barebox_mlo.config" > # PTXCONF_BAREBOX_BBENV is not set > > > ~/git/ptxdist/bin/ptxdist print BAREBOX_MLO_URL > http://www.barebox.org/download/barebox-.tar.bz2 > > > > Michael > > > > > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> > > > --- > > > platforms/barebox_mlo.in | 19 ++++++++++ > > > rules/barebox_mlo.make | 88 ++++++++++++++++++++++++++++++++++++++++++++++ > > > 2 files changed, 107 insertions(+), 0 deletions(-) > > > create mode 100644 platforms/barebox_mlo.in > > > create mode 100644 rules/barebox_mlo.make > > > > > > diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in > > > new file mode 100644 > > > index 0000000..f1e9c78 > > > --- /dev/null > > > +++ b/platforms/barebox_mlo.in > > > @@ -0,0 +1,19 @@ > > > +## SECTION=bootloader > > > + > > > +menuconfig BAREBOX_MLO > > > + prompt "barebox mlo " > > > + bool > > > + depends on BAREBOX > > > + help > > > + Build mlo from barebox sources. > > > + > > > +if BAREBOX_MLO > > > + > > > +config BAREBOX_MLO_CONFIG > > > + prompt "mlo config file" > > > + string > > > + default "barebox_mlo.config" > > > + help > > > + This entry specifies the .config file used to compile mlo. > > > + > > > +endif > > > diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make > > > new file mode 100644 > > > index 0000000..0efab3b > > > --- /dev/null > > > +++ b/rules/barebox_mlo.make > > > @@ -0,0 +1,88 @@ > > > +# -*-makefile-*- > > > +# > > > +# Copyright (C) 2012 Jan Weitzel <j.weitzel@phytec.de> > > > +# > > > +# See CREDITS for details about who has contributed to this project. > > > +# > > > +# For further information about the PTXdist project and license conditions > > > +# see the README file. > > > +# > > > + > > > +# > > > +# We provide this package > > > +# > > > +PACKAGES-$(PTXCONF_BAREBOX_MLO) += barebox_mlo > > > + > > > +# > > > +# Paths and names > > > +# > > > +BAREBOX_MLO_VERSION = $(BAREBOX_VERSION) > > > +BAREBOX_MLO_MD5 = $(BAREBOX_MD5) > > > +BAREBOX_MLO = $(BAREBOX) > > > +BAREBOX_MLO_DIR = $(BUILDDIR)/barebox_mlo-$(BAREBOX_MLO_VERSION) > > > +BAREBOX_MLO_SOURCE = $(BAREBOX_SOURCE) > > > +BAREBOX_MLO_LICENSE := GPLv2 > > > + > > > +BAREBOX_MLO_CONFIG := $(call remove_quotes, \ > > > + $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_BAREBOX_MLO_CONFIG)) > > > + > > > +# ---------------------------------------------------------------------------- > > > +# Prepare > > > +# ---------------------------------------------------------------------------- > > > +BAREBOX_MLO_CONF_ENV := KCONFIG_NOTIMESTAMP=1 > > > +BAREBOX_MLO_CONF_TOOL := kconfig > > > +BAREBOX_MLO_CONF_OPT := \ > > > + HOSTCC=$(HOSTCC) \ > > > + ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ > > > + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) > > > + > > > +BAREBOX_MLO_MAKE_OPT := $(BAREBOX_MLO_CONF_OPT) > > > + > > > +# ---------------------------------------------------------------------------- > > > +# Install > > > +# ---------------------------------------------------------------------------- > > > + > > > +$(STATEDIR)/barebox_mlo.install: > > > + @$(call targetinfo) > > > + @$(call touch) > > > + > > > +# ---------------------------------------------------------------------------- > > > +# Target-Install > > > +# ---------------------------------------------------------------------------- > > > + > > > +$(STATEDIR)/barebox_mlo.targetinstall: > > > + @$(call targetinfo) > > > +# #barebox renamed barebox.bin.ift to MLO, so fall back to barebox.bin.ift > > > + @ptxd_get_path "$(BAREBOX_MLO_DIR)/MLO" \ > > > + "$(BAREBOX_MLO_DIR)/barebox.bin.ift" && \ > > > + install -D -m644 "$${ptxd_reply}" "$(IMAGEDIR)/MLO" > > > + > > > + @$(call touch) > > > + > > > +# ---------------------------------------------------------------------------- > > > +# Clean > > > +# ---------------------------------------------------------------------------- > > > + > > > +$(STATEDIR)/barebox_mlo.clean: > > > + @$(call targetinfo) > > > + @$(call clean_pkg, BAREBOX_MLO) > > > + rm -rf $(IMAGEDIR)/MLO > > > + > > > +# ---------------------------------------------------------------------------- > > > +# oldconfig / menuconfig > > > +# ---------------------------------------------------------------------------- > > > + > > > +barebox_mlo_oldconfig barebox_mlo_menuconfig: $(STATEDIR)/barebox_mlo.extract > > > + @if test -e $(BAREBOX_MLO_CONFIG); then \ > > > + cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \ > > > + fi > > > + cd $(BAREBOX_MLO_DIR) && \ > > > + $(BAREBOX_MLO_PATH) $(BAREBOX_MLO_ENV) $(MAKE) \ > > > + $(BAREBOX_MLO_MAKEVARS) $(subst barebox_mlo_,,$@) > > > + @if cmp -s $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); then \ > > > + echo "barebox_mlo configuration unchanged"; \ > > > + else \ > > > + cp $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); \ > > > + fi > > > + > > > +# vim: syntax=make > > > -- > > > 1.7.0.4 > > > > > > > > > -- > > > 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-5555 | > > > > > > -- > 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-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [PATCH] Build MLO from barebox sources 2012-03-09 12:47 ` [ptxdist] [PATCH] Build MLO from barebox sources Michael Olbrich @ 2012-03-09 14:23 ` Jan Weitzel 2012-03-09 14:40 ` Michael Olbrich 0 siblings, 1 reply; 19+ messages in thread From: Jan Weitzel @ 2012-03-09 14:23 UTC (permalink / raw) To: ptxdist Am Freitag, den 09.03.2012, 13:47 +0100 schrieb Michael Olbrich: > On Fri, Mar 09, 2012 at 11:02:44AM +0100, Jan Weitzel wrote: > > Am Donnerstag, den 08.03.2012, 14:23 +0100 schrieb Michael Olbrich: > > > On Thu, Feb 23, 2012 at 05:40:51PM +0100, Jan Weitzel wrote: > > > > Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG > > > > Default config is barebox_mlo.config. > > > > > > Applied. > > > I did some more modifications in another commit. Please check that it still > > > works for you. > > No, version is missing in url. Fixed by a hint from you ;) > > I am going to send the patch. > > > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo > > Did you run "ptxdist oldconfig" first? If barebox is enabled the > PTXCONF_BAREBOX_MLO_VERSION defaults to PTXCONF_BAREBOX_VERSION. However > without oldconfig this will not be set. Hello, oldconfig didn't help: ~/git/ptxdist/bin/ptxdist oldconfig ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo ------------------------ target: barebox-.tar.bz2 ------------------------ --2012-03-09 15:21:05-- http://www.barebox.org/download/barebox-.tar.bz2 Resolving www.barebox.org... 78.47.139.85, 2a01:4f8:121:2:5054:ff:feaf:fc62 Connecting to www.barebox.org|78.47.139.85|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2012-03-09 15:21:05 ERROR 404: Not Found. --2012-03-09 15:21:05-- http://www.pengutronix.de/software/ptxdist/temporary-src/barebox-.tar.bz2 Resolving www.pengutronix.de... 78.47.139.85, 2a01:4f8:121:2:5054:ff:feaf:fc62 Connecting to www.pengutronix.de|78.47.139.85|:80... connected. HTTP request sent, awaiting response... 404 Not Found 2012-03-09 15:21:05 ERROR 404: Not Found. Could not download packet URL: http://www.barebox.org/download/barebox-.tar.bz2 make: *** [/home/ptxdist_src/barebox-.tar.bz2] Error 1 > Michael > > > ------------------------ > > target: barebox-.tar.bz2 > > ------------------------ > > > > --2012-03-09 10:41:41-- > > http://www.barebox.org/download/barebox-.tar.bz2 > > Resolving www.barebox.org... 78.47.139.85, > > 2a01:4f8:121:2:5054:ff:feaf:fc62 > > Connecting to www.barebox.org|78.47.139.85|:80... connected. > > HTTP request sent, awaiting response... 404 Not Found > > 2012-03-09 10:41:41 ERROR 404: Not Found. > > > > --2012-03-09 10:41:41-- > > http://www.pengutronix.de/software/ptxdist/temporary-src/barebox-.tar.bz2 > > Resolving www.pengutronix.de... 78.47.139.85, > > 2a01:4f8:121:2:5054:ff:feaf:fc62 > > Connecting to www.pengutronix.de|78.47.139.85|:80... connected. > > HTTP request sent, awaiting response... 404 Not Found > > 2012-03-09 10:41:41 ERROR 404: Not Found. > > > > > > Could not download packet > > URL: http://www.barebox.org/download/barebox-.tar.bz2 > > > > make: *** [/home/ptxdist_src/barebox-.tar.bz2] Error 1 > > > > > > > > > > > > > > grep BAREBOX selected_platformconfig > > PTXCONF_BAREBOX=y > > PTXCONF_BAREBOX_VERSION="2011.12.0" > > PTXCONF_BAREBOX_MD5="a2f7725dfb5b15b2f3275663d663ab3b" > > PTXCONF_BAREBOX_CONFIG="barebox.config" > > PTXCONF_BAREBOX_ARCH_STRING="arm" > > PTXCONF_BAREBOX_EXTRA_ENV=y > > PTXCONF_BAREBOX_EXTRA_ENV_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-defaultenv" > > PTXCONF_BAREBOX_MLO=y > > PTXCONF_BAREBOX_MLO_VERSION="${BAREBOX_VERSION}" > > PTXCONF_BAREBOX_MLO_MD5="${BAREBOX_MD5}" > > PTXCONF_BAREBOX_MLO_ARCH_STRING="arm" > > PTXCONF_BAREBOX_MLO_CONFIG="barebox_mlo.config" > > # PTXCONF_BAREBOX_BBENV is not set > > > > > > ~/git/ptxdist/bin/ptxdist print BAREBOX_MLO_URL > > http://www.barebox.org/download/barebox-.tar.bz2 > > > > > > > Michael > > > > > > > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de> > > > > --- > > > > platforms/barebox_mlo.in | 19 ++++++++++ > > > > rules/barebox_mlo.make | 88 ++++++++++++++++++++++++++++++++++++++++++++++ > > > > 2 files changed, 107 insertions(+), 0 deletions(-) > > > > create mode 100644 platforms/barebox_mlo.in > > > > create mode 100644 rules/barebox_mlo.make > > > > > > > > diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in > > > > new file mode 100644 > > > > index 0000000..f1e9c78 > > > > --- /dev/null > > > > +++ b/platforms/barebox_mlo.in > > > > @@ -0,0 +1,19 @@ > > > > +## SECTION=bootloader > > > > + > > > > +menuconfig BAREBOX_MLO > > > > + prompt "barebox mlo " > > > > + bool > > > > + depends on BAREBOX > > > > + help > > > > + Build mlo from barebox sources. > > > > + > > > > +if BAREBOX_MLO > > > > + > > > > +config BAREBOX_MLO_CONFIG > > > > + prompt "mlo config file" > > > > + string > > > > + default "barebox_mlo.config" > > > > + help > > > > + This entry specifies the .config file used to compile mlo. > > > > + > > > > +endif > > > > diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make > > > > new file mode 100644 > > > > index 0000000..0efab3b > > > > --- /dev/null > > > > +++ b/rules/barebox_mlo.make > > > > @@ -0,0 +1,88 @@ > > > > +# -*-makefile-*- > > > > +# > > > > +# Copyright (C) 2012 Jan Weitzel <j.weitzel@phytec.de> > > > > +# > > > > +# See CREDITS for details about who has contributed to this project. > > > > +# > > > > +# For further information about the PTXdist project and license conditions > > > > +# see the README file. > > > > +# > > > > + > > > > +# > > > > +# We provide this package > > > > +# > > > > +PACKAGES-$(PTXCONF_BAREBOX_MLO) += barebox_mlo > > > > + > > > > +# > > > > +# Paths and names > > > > +# > > > > +BAREBOX_MLO_VERSION = $(BAREBOX_VERSION) > > > > +BAREBOX_MLO_MD5 = $(BAREBOX_MD5) > > > > +BAREBOX_MLO = $(BAREBOX) > > > > +BAREBOX_MLO_DIR = $(BUILDDIR)/barebox_mlo-$(BAREBOX_MLO_VERSION) > > > > +BAREBOX_MLO_SOURCE = $(BAREBOX_SOURCE) > > > > +BAREBOX_MLO_LICENSE := GPLv2 > > > > + > > > > +BAREBOX_MLO_CONFIG := $(call remove_quotes, \ > > > > + $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_BAREBOX_MLO_CONFIG)) > > > > + > > > > +# ---------------------------------------------------------------------------- > > > > +# Prepare > > > > +# ---------------------------------------------------------------------------- > > > > +BAREBOX_MLO_CONF_ENV := KCONFIG_NOTIMESTAMP=1 > > > > +BAREBOX_MLO_CONF_TOOL := kconfig > > > > +BAREBOX_MLO_CONF_OPT := \ > > > > + HOSTCC=$(HOSTCC) \ > > > > + ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ > > > > + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) > > > > + > > > > +BAREBOX_MLO_MAKE_OPT := $(BAREBOX_MLO_CONF_OPT) > > > > + > > > > +# ---------------------------------------------------------------------------- > > > > +# Install > > > > +# ---------------------------------------------------------------------------- > > > > + > > > > +$(STATEDIR)/barebox_mlo.install: > > > > + @$(call targetinfo) > > > > + @$(call touch) > > > > + > > > > +# ---------------------------------------------------------------------------- > > > > +# Target-Install > > > > +# ---------------------------------------------------------------------------- > > > > + > > > > +$(STATEDIR)/barebox_mlo.targetinstall: > > > > + @$(call targetinfo) > > > > +# #barebox renamed barebox.bin.ift to MLO, so fall back to barebox.bin.ift > > > > + @ptxd_get_path "$(BAREBOX_MLO_DIR)/MLO" \ > > > > + "$(BAREBOX_MLO_DIR)/barebox.bin.ift" && \ > > > > + install -D -m644 "$${ptxd_reply}" "$(IMAGEDIR)/MLO" > > > > + > > > > + @$(call touch) > > > > + > > > > +# ---------------------------------------------------------------------------- > > > > +# Clean > > > > +# ---------------------------------------------------------------------------- > > > > + > > > > +$(STATEDIR)/barebox_mlo.clean: > > > > + @$(call targetinfo) > > > > + @$(call clean_pkg, BAREBOX_MLO) > > > > + rm -rf $(IMAGEDIR)/MLO > > > > + > > > > +# ---------------------------------------------------------------------------- > > > > +# oldconfig / menuconfig > > > > +# ---------------------------------------------------------------------------- > > > > + > > > > +barebox_mlo_oldconfig barebox_mlo_menuconfig: $(STATEDIR)/barebox_mlo.extract > > > > + @if test -e $(BAREBOX_MLO_CONFIG); then \ > > > > + cp $(BAREBOX_MLO_CONFIG) $(BAREBOX_MLO_DIR)/.config; \ > > > > + fi > > > > + cd $(BAREBOX_MLO_DIR) && \ > > > > + $(BAREBOX_MLO_PATH) $(BAREBOX_MLO_ENV) $(MAKE) \ > > > > + $(BAREBOX_MLO_MAKEVARS) $(subst barebox_mlo_,,$@) > > > > + @if cmp -s $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); then \ > > > > + echo "barebox_mlo configuration unchanged"; \ > > > > + else \ > > > > + cp $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); \ > > > > + fi > > > > + > > > > +# vim: syntax=make > > > > -- > > > > 1.7.0.4 > > > > > > > > > > > > -- > > > > 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-5555 | > > > > > > > > > > > -- > > 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-5555 | > -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [PATCH] Build MLO from barebox sources 2012-03-09 14:23 ` Jan Weitzel @ 2012-03-09 14:40 ` Michael Olbrich 2012-03-14 13:15 ` Jan Weitzel 0 siblings, 1 reply; 19+ messages in thread From: Michael Olbrich @ 2012-03-09 14:40 UTC (permalink / raw) To: ptxdist On Fri, Mar 09, 2012 at 03:23:51PM +0100, Jan Weitzel wrote: > Am Freitag, den 09.03.2012, 13:47 +0100 schrieb Michael Olbrich: > > On Fri, Mar 09, 2012 at 11:02:44AM +0100, Jan Weitzel wrote: > > > Am Donnerstag, den 08.03.2012, 14:23 +0100 schrieb Michael Olbrich: > > > > On Thu, Feb 23, 2012 at 05:40:51PM +0100, Jan Weitzel wrote: > > > > > Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG > > > > > Default config is barebox_mlo.config. > > > > > > > > Applied. > > > > I did some more modifications in another commit. Please check that it still > > > > works for you. > > > No, version is missing in url. Fixed by a hint from you ;) > > > I am going to send the patch. > > > > > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo > > > > Did you run "ptxdist oldconfig" first? If barebox is enabled the > > PTXCONF_BAREBOX_MLO_VERSION defaults to PTXCONF_BAREBOX_VERSION. However > > without oldconfig this will not be set. > Hello, oldconfig didn't help: > > ~/git/ptxdist/bin/ptxdist oldconfig Sorry, I meant of course: $ ptxdist oldconfig platform > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo if it still does not work (or where ever your platformconfig is): $ grep BAREBOX selected_platformconfig Michael -- 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-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [PATCH] Build MLO from barebox sources 2012-03-09 14:40 ` Michael Olbrich @ 2012-03-14 13:15 ` Jan Weitzel 2012-03-14 14:31 ` Michael Olbrich 0 siblings, 1 reply; 19+ messages in thread From: Jan Weitzel @ 2012-03-14 13:15 UTC (permalink / raw) To: ptxdist Am Freitag, den 09.03.2012, 15:40 +0100 schrieb Michael Olbrich: > On Fri, Mar 09, 2012 at 03:23:51PM +0100, Jan Weitzel wrote: > > Am Freitag, den 09.03.2012, 13:47 +0100 schrieb Michael Olbrich: > > > On Fri, Mar 09, 2012 at 11:02:44AM +0100, Jan Weitzel wrote: > > > > Am Donnerstag, den 08.03.2012, 14:23 +0100 schrieb Michael Olbrich: > > > > > On Thu, Feb 23, 2012 at 05:40:51PM +0100, Jan Weitzel wrote: > > > > > > Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG > > > > > > Default config is barebox_mlo.config. > > > > > > > > > > Applied. > > > > > I did some more modifications in another commit. Please check that it still > > > > > works for you. > > > > No, version is missing in url. Fixed by a hint from you ;) > > > > I am going to send the patch. > > > > > > > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo > > > > > > Did you run "ptxdist oldconfig" first? If barebox is enabled the > > > PTXCONF_BAREBOX_MLO_VERSION defaults to PTXCONF_BAREBOX_VERSION. However > > > without oldconfig this will not be set. > > Hello, oldconfig didn't help: > > > > ~/git/ptxdist/bin/ptxdist oldconfig > > Sorry, I meant of course: > $ ptxdist oldconfig platform still the same error: weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ ~/git/ptxdist/bin/ptxdist oldconfig platform weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo ------------------------ target: barebox-.tar.bz2 ------------------------ --2012-03-14 14:07:24-- http://www.barebox.org/download/barebox-.tar.bz2 ... > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo > > if it still does not work (or where ever your platformconfig is): > > $ grep BAREBOX selected_platformconfig weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ grep BAREBOX selected_platformconfig PTXCONF_BAREBOX=y PTXCONF_BAREBOX_VERSION="2011.12.0" PTXCONF_BAREBOX_MD5="a2f7725dfb5b15b2f3275663d663ab3b" PTXCONF_BAREBOX_CONFIG="barebox.config" PTXCONF_BAREBOX_ARCH_STRING="arm" PTXCONF_BAREBOX_EXTRA_ENV=y PTXCONF_BAREBOX_EXTRA_ENV_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-defaultenv" PTXCONF_BAREBOX_MLO=y PTXCONF_BAREBOX_MLO_VERSION="${BAREBOX_VERSION}" PTXCONF_BAREBOX_MLO_MD5="${BAREBOX_MD5}" PTXCONF_BAREBOX_MLO_ARCH_STRING="arm" PTXCONF_BAREBOX_MLO_CONFIG="barebox_mlo.config" # PTXCONF_BAREBOX_BBENV is not set Jan > Michael > > -- > 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-5555 | > -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [PATCH] Build MLO from barebox sources 2012-03-14 13:15 ` Jan Weitzel @ 2012-03-14 14:31 ` Michael Olbrich 2012-03-15 8:27 ` Jan Weitzel 0 siblings, 1 reply; 19+ messages in thread From: Michael Olbrich @ 2012-03-14 14:31 UTC (permalink / raw) To: ptxdist On Wed, Mar 14, 2012 at 02:15:01PM +0100, Jan Weitzel wrote: > Am Freitag, den 09.03.2012, 15:40 +0100 schrieb Michael Olbrich: > > On Fri, Mar 09, 2012 at 03:23:51PM +0100, Jan Weitzel wrote: > > > Am Freitag, den 09.03.2012, 13:47 +0100 schrieb Michael Olbrich: > > > > On Fri, Mar 09, 2012 at 11:02:44AM +0100, Jan Weitzel wrote: > > > > > Am Donnerstag, den 08.03.2012, 14:23 +0100 schrieb Michael Olbrich: > > > > > > On Thu, Feb 23, 2012 at 05:40:51PM +0100, Jan Weitzel wrote: > > > > > > > Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG > > > > > > > Default config is barebox_mlo.config. > > > > > > > > > > > > Applied. > > > > > > I did some more modifications in another commit. Please check that it still > > > > > > works for you. > > > > > No, version is missing in url. Fixed by a hint from you ;) > > > > > I am going to send the patch. > > > > > > > > > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo > > > > > > > > Did you run "ptxdist oldconfig" first? If barebox is enabled the > > > > PTXCONF_BAREBOX_MLO_VERSION defaults to PTXCONF_BAREBOX_VERSION. However > > > > without oldconfig this will not be set. > > > Hello, oldconfig didn't help: > > > > > > ~/git/ptxdist/bin/ptxdist oldconfig > > > > Sorry, I meant of course: > > $ ptxdist oldconfig platform > > still the same error: Arg, sorry my fault, I used the wrong config to test this. Now I get the problem. I've pushed a fix to master. Michael > weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ ~/git/ptxdist/bin/ptxdist oldconfig platform > weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ ~/git/ptxdist/bin/ptxdist > targetinstall barebox_mlo > > ------------------------ > target: barebox-.tar.bz2 > ------------------------ > > --2012-03-14 14:07:24-- > http://www.barebox.org/download/barebox-.tar.bz2 > ... > > > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo > > > > if it still does not work (or where ever your platformconfig is): > > > > $ grep BAREBOX selected_platformconfig > > weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ grep BAREBOX > selected_platformconfig > PTXCONF_BAREBOX=y > PTXCONF_BAREBOX_VERSION="2011.12.0" > PTXCONF_BAREBOX_MD5="a2f7725dfb5b15b2f3275663d663ab3b" > PTXCONF_BAREBOX_CONFIG="barebox.config" > PTXCONF_BAREBOX_ARCH_STRING="arm" > PTXCONF_BAREBOX_EXTRA_ENV=y > PTXCONF_BAREBOX_EXTRA_ENV_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-defaultenv" > PTXCONF_BAREBOX_MLO=y > PTXCONF_BAREBOX_MLO_VERSION="${BAREBOX_VERSION}" > PTXCONF_BAREBOX_MLO_MD5="${BAREBOX_MD5}" > PTXCONF_BAREBOX_MLO_ARCH_STRING="arm" > PTXCONF_BAREBOX_MLO_CONFIG="barebox_mlo.config" > # PTXCONF_BAREBOX_BBENV is not set > > Jan > > Michael > > > > -- > > 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-5555 | > > > > > > -- > 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-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [ptxdist] [PATCH] Build MLO from barebox sources 2012-03-14 14:31 ` Michael Olbrich @ 2012-03-15 8:27 ` Jan Weitzel 0 siblings, 0 replies; 19+ messages in thread From: Jan Weitzel @ 2012-03-15 8:27 UTC (permalink / raw) To: ptxdist Am Mittwoch, den 14.03.2012, 15:31 +0100 schrieb Michael Olbrich: > On Wed, Mar 14, 2012 at 02:15:01PM +0100, Jan Weitzel wrote: > > Am Freitag, den 09.03.2012, 15:40 +0100 schrieb Michael Olbrich: > > > On Fri, Mar 09, 2012 at 03:23:51PM +0100, Jan Weitzel wrote: > > > > Am Freitag, den 09.03.2012, 13:47 +0100 schrieb Michael Olbrich: > > > > > On Fri, Mar 09, 2012 at 11:02:44AM +0100, Jan Weitzel wrote: > > > > > > Am Donnerstag, den 08.03.2012, 14:23 +0100 schrieb Michael Olbrich: > > > > > > > On Thu, Feb 23, 2012 at 05:40:51PM +0100, Jan Weitzel wrote: > > > > > > > > Build MLO in $(BUILDDIR)/barebox_mlo-* with config PTXCONF_BAREBOX_MLO_CONFIG > > > > > > > > Default config is barebox_mlo.config. > > > > > > > > > > > > > > Applied. > > > > > > > I did some more modifications in another commit. Please check that it still > > > > > > > works for you. > > > > > > No, version is missing in url. Fixed by a hint from you ;) > > > > > > I am going to send the patch. > > > > > > > > > > > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo > > > > > > > > > > Did you run "ptxdist oldconfig" first? If barebox is enabled the > > > > > PTXCONF_BAREBOX_MLO_VERSION defaults to PTXCONF_BAREBOX_VERSION. However > > > > > without oldconfig this will not be set. > > > > Hello, oldconfig didn't help: > > > > > > > > ~/git/ptxdist/bin/ptxdist oldconfig > > > > > > Sorry, I meant of course: > > > $ ptxdist oldconfig platform > > > > still the same error: > > Arg, sorry my fault, I used the wrong config to test this. Now I get the > problem. I've pushed a fix to master. works :) > Michael > > > weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ ~/git/ptxdist/bin/ptxdist oldconfig platform > > weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ ~/git/ptxdist/bin/ptxdist > > targetinstall barebox_mlo > > > > ------------------------ > > target: barebox-.tar.bz2 > > ------------------------ > > > > --2012-03-14 14:07:24-- > > http://www.barebox.org/download/barebox-.tar.bz2 > > ... > > > > > > ~/git/ptxdist/bin/ptxdist targetinstall barebox_mlo > > > > > > if it still does not work (or where ever your platformconfig is): > > > > > > $ grep BAREBOX selected_platformconfig > > > > weitzel@numalfix:~/tmp/BSP-Phytec-phyCARD-XL2$ grep BAREBOX > > selected_platformconfig > > PTXCONF_BAREBOX=y > > PTXCONF_BAREBOX_VERSION="2011.12.0" > > PTXCONF_BAREBOX_MD5="a2f7725dfb5b15b2f3275663d663ab3b" > > PTXCONF_BAREBOX_CONFIG="barebox.config" > > PTXCONF_BAREBOX_ARCH_STRING="arm" > > PTXCONF_BAREBOX_EXTRA_ENV=y > > PTXCONF_BAREBOX_EXTRA_ENV_PATH="${PTXDIST_PLATFORMCONFIGDIR}/barebox-defaultenv" > > PTXCONF_BAREBOX_MLO=y > > PTXCONF_BAREBOX_MLO_VERSION="${BAREBOX_VERSION}" > > PTXCONF_BAREBOX_MLO_MD5="${BAREBOX_MD5}" > > PTXCONF_BAREBOX_MLO_ARCH_STRING="arm" > > PTXCONF_BAREBOX_MLO_CONFIG="barebox_mlo.config" > > # PTXCONF_BAREBOX_BBENV is not set > > > > Jan > > > Michael > > > > > > -- > > > 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-5555 | > > > > > > > > > > > -- > > 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-5555 | > -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2012-03-15 8:27 UTC | newest] Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-02-21 13:54 [ptxdist] MLO Jan Weitzel 2012-02-21 15:09 ` Michael Olbrich 2012-02-21 15:25 ` Jan Weitzel 2012-02-21 16:47 ` Michael Olbrich 2012-02-23 7:31 ` [ptxdist] [RFC] Build MLO from barebox sources Jan Weitzel 2012-02-23 7:47 ` Jan Weitzel 2012-02-23 9:40 ` Michael Olbrich 2012-02-23 16:46 ` Jan Weitzel 2012-02-23 9:54 ` Michael Olbrich 2012-02-23 16:40 ` [ptxdist] [PATCH] " Jan Weitzel 2012-03-08 13:23 ` Michael Olbrich 2012-03-09 10:02 ` Jan Weitzel 2012-03-09 10:03 ` [ptxdist] [PATCH] barebox_mlo: fix resolving BAREBOX_MLO_ Jan Weitzel 2012-03-09 12:47 ` [ptxdist] [PATCH] Build MLO from barebox sources Michael Olbrich 2012-03-09 14:23 ` Jan Weitzel 2012-03-09 14:40 ` Michael Olbrich 2012-03-14 13:15 ` Jan Weitzel 2012-03-14 14:31 ` Michael Olbrich 2012-03-15 8:27 ` Jan Weitzel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox