diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-03-06 09:03:06 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-03-08 12:18:57 +0100 |
| commit | f593b5ead7bd532954c022e7198faa95647a2303 (patch) | |
| tree | f47f646b23738ffacc72e542c80475f0f2f39f5d | |
| parent | e790fc7c645927cdd8b71fad079c682f9ef1fb0f (diff) | |
| download | ptxdist-f593b5ead7bd532954c022e7198faa95647a2303.tar.gz ptxdist-f593b5ead7bd532954c022e7198faa95647a2303.tar.xz | |
barebox_mlo: cleanup
- add config file dependency
- fix menuconfig etc.
- make it possible to build without normal barebox
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | platforms/barebox_mlo.in | 19 | ||||
| -rw-r--r-- | rules/barebox_mlo.make | 31 |
2 files changed, 41 insertions, 9 deletions
diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in index f1e9c78e9..4201d8787 100644 --- a/platforms/barebox_mlo.in +++ b/platforms/barebox_mlo.in @@ -3,12 +3,29 @@ menuconfig BAREBOX_MLO prompt "barebox mlo " bool - depends on BAREBOX help Build mlo from barebox sources. if BAREBOX_MLO +config BAREBOX_MLO_VERSION + prompt "barebox version" if !BAREBOX + string + default "${BAREBOX_VERSION}" if BAREBOX + default "2010.10.0" if !BAREBOX + +config BAREBOX_MLO_MD5 + prompt "barebox source md5sum" if !BAREBOX + string + default "${BAREBOX_MD5}" if BAREBOX + +config BAREBOX_MLO_ARCH_STRING + string + default "arm" if ARCH_ARM + default "blackfin" if ARCH_BLACKFIN + default "ppc" if ARCH_PPC + default "x86" if ARCH_X86 + config BAREBOX_MLO_CONFIG prompt "mlo config file" string diff --git a/rules/barebox_mlo.make b/rules/barebox_mlo.make index 0efab3b01..018f2739f 100644 --- a/rules/barebox_mlo.make +++ b/rules/barebox_mlo.make @@ -16,11 +16,12 @@ 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_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) BAREBOX_MLO_LICENSE := GPLv2 BAREBOX_MLO_CONFIG := $(call remove_quotes, \ @@ -29,15 +30,29 @@ BAREBOX_MLO_CONFIG := $(call remove_quotes, \ # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- +BAREBOX_MLO_PATH := PATH=$(CROSS_PATH) BAREBOX_MLO_CONF_ENV := KCONFIG_NOTIMESTAMP=1 BAREBOX_MLO_CONF_TOOL := kconfig BAREBOX_MLO_CONF_OPT := \ HOSTCC=$(HOSTCC) \ - ARCH=$(PTXCONF_BAREBOX_ARCH_STRING) \ + ARCH=$(PTXCONF_BAREBOX_MLO_ARCH_STRING) \ CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) BAREBOX_MLO_MAKE_OPT := $(BAREBOX_MLO_CONF_OPT) +ifdef PTXCONF_BAREBOX_MLO +$(BAREBOX_MLO_CONFIG): + @echo + @echo "****************************************************************************" + @echo "*Please generate a barebox MLO config with 'ptxdist menuconfig barebox_mlo'*" + @echo "****************************************************************************" + @echo + @echo + @exit 1 +endif + +$(STATEDIR)/barebox_mlo.prepare: $(BAREBOX_MLO_CONFIG) + # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- @@ -77,8 +92,8 @@ barebox_mlo_oldconfig barebox_mlo_menuconfig: $(STATEDIR)/barebox_mlo.extract 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_,,$@) + $(BAREBOX_MLO_PATH) $(BAREBOX_MLO_CONF_ENV) $(MAKE) \ + $(BAREBOX_MLO_CONF_OPT) $(subst barebox_mlo_,,$@) @if cmp -s $(BAREBOX_MLO_DIR)/.config $(BAREBOX_MLO_CONFIG); then \ echo "barebox_mlo configuration unchanged"; \ else \ |