mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Guillermo Rodriguez <guille.rodriguez@gmail.com>
To: ptxdist@pengutronix.de
Cc: grodriguez <guille.rodriguez@gmail.com>
Subject: [ptxdist] [PATCH] Update at91bootstrap2 package for compatibility with 3.x series
Date: Tue, 30 Aug 2016 10:34:43 +0200	[thread overview]
Message-ID: <1472546083-21471-1-git-send-email-guille.rodriguez@gmail.com> (raw)
In-Reply-To: <CABDcavbaYU85yNoKMBHEVQO=r+fB6aTQLfEeOWm0-Tfr5sBo2A@mail.gmail.com>

From: grodriguez <guille.rodriguez@gmail.com>

The original 2.x series of at91bootstrap are not available anymore,
and the current rules don't work with the 3.x series. Update them
for at91bootstrap 3.4 and above.

Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
 platforms/at91bootstrap2.in |    8 ++++----
 rules/at91bootstrap2.make   |   13 +++++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/platforms/at91bootstrap2.in b/platforms/at91bootstrap2.in
index ebaf349..80f0542 100644
--- a/platforms/at91bootstrap2.in
+++ b/platforms/at91bootstrap2.in
@@ -2,9 +2,9 @@
 
 menuconfig AT91BOOTSTRAP2
 	tristate
-	prompt "AT91 bootstrap 2.x            "
+	prompt "AT91 bootstrap 3.x            "
 	help
-	  Note: this is for AT91 bootstrap version 2.x
+	  Note: this is for AT91 bootstrap version 3.4 or later.
 
 	  The AT91Bootstrap application is a first level bootloader
 	  for Atmel AT91SAM9 ARM Thumb-based microcontrollers.
@@ -35,10 +35,10 @@ if AT91BOOTSTRAP2
 
 config AT91BOOTSTRAP2_VERSION
 	string
-	default "2.13"
+	default "3.8.5"
 	prompt "AT91 Bootstrap version"
 	help
-	  Enter the AT91 Bootstrap version you want to build. Usally something like "1.11"
+	  Enter the AT91 Bootstrap version you want to build. Usally something like "3.8.5"
 
 config AT91BOOTSTRAP2_MD5
 	prompt "AT91 Bootstrap source md5sum"
diff --git a/rules/at91bootstrap2.make b/rules/at91bootstrap2.make
index 4f1aef3..33c7003 100644
--- a/rules/at91bootstrap2.make
+++ b/rules/at91bootstrap2.make
@@ -19,8 +19,8 @@ PACKAGES-$(PTXCONF_AT91BOOTSTRAP2) += at91bootstrap2
 AT91BOOTSTRAP2_VERSION	:= $(call remove_quotes, $(PTXCONF_AT91BOOTSTRAP2_VERSION))
 AT91BOOTSTRAP2_MD5	:= $(call remove_quotes, $(PTXCONF_AT91BOOTSTRAP2_MD5))
 AT91BOOTSTRAP2		:= at91bootstrap-$(AT91BOOTSTRAP2_VERSION)
-AT91BOOTSTRAP2_SUFFIX	:= tar.bz2
-AT91BOOTSTRAP2_URL	:= ftp://www.at91.com/pub/buildroot/$(AT91BOOTSTRAP2).$(AT91BOOTSTRAP2_SUFFIX)
+AT91BOOTSTRAP2_SUFFIX	:= tar.gz
+AT91BOOTSTRAP2_URL	:= https://github.com/linux4sam/at91bootstrap/archive/v$(AT91BOOTSTRAP2_VERSION).$(AT91BOOTSTRAP2_SUFFIX)
 AT91BOOTSTRAP2_SOURCE	:= $(SRCDIR)/$(AT91BOOTSTRAP2).$(AT91BOOTSTRAP2_SUFFIX)
 AT91BOOTSTRAP2_DIR	:= $(BUILDDIR)/$(AT91BOOTSTRAP2)
 AT91BOOTSTRAP2_CONFIG	:= $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_AT91BOOTSTRAP2_CONFIG))
@@ -70,8 +70,13 @@ $(STATEDIR)/at91bootstrap2.install:
 
 $(STATEDIR)/at91bootstrap2.targetinstall:
 	@$(call targetinfo)
-	install -m644 $(AT91BOOTSTRAP2_DIR)/binaries/*boot-$(AT91BOOTSTRAP2_VERSION).bin \
-		$(IMAGEDIR)/at91bootstrap.bin
+	@if [ -e $(AT91BOOTSTRAP2_DIR)/binaries/at91bootstrap.bin ]; then \
+		install -m644 $(AT91BOOTSTRAP2_DIR)/binaries/at91bootstrap.bin \
+			$(IMAGEDIR)/at91bootstrap.bin; \
+	else \
+		install -m644 $(AT91BOOTSTRAP2_DIR)/binaries/*boot-$(AT91BOOTSTRAP2_VERSION).bin \
+			$(IMAGEDIR)/at91bootstrap.bin; \
+	fi
 	@$(call touch)
 
 # ----------------------------------------------------------------------------
-- 
1.7.9.5


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

  reply	other threads:[~2016-08-30  8:35 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-22 14:41 [ptxdist] AT91bootstrap with ptxdist Guillermo Rodriguez Garcia
2016-08-25 10:54 ` Michael Olbrich
2016-08-25 11:15   ` Guillermo Rodriguez Garcia
2016-08-29  7:26     ` Guillermo Rodriguez Garcia
2016-08-30  7:19       ` Guillermo Rodriguez Garcia
2016-08-30  8:34         ` Guillermo Rodriguez [this message]
2016-09-02 11:53         ` Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1472546083-21471-1-git-send-email-guille.rodriguez@gmail.com \
    --to=guille.rodriguez@gmail.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox