mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Jan Luebbe <jlu@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 1/8] fixup! ARM: MXS: Add multiimage support
Date: Thu, 25 Dec 2014 18:08:58 +0100	[thread overview]
Message-ID: <1419527345-9301-1-git-send-email-jlu@pengutronix.de> (raw)

The MX23 needs a different image config, so use separate files for
MX23/MX28.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
---
 arch/arm/mach-mxs/mxs23img.cfg | 6 ++++++
 arch/arm/mach-mxs/mxs28img.cfg | 8 ++++++++
 arch/arm/mach-mxs/mxsimg.cfg   | 8 --------
 images/Makefile.mxs            | 5 +++--
 4 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 arch/arm/mach-mxs/mxs23img.cfg
 create mode 100644 arch/arm/mach-mxs/mxs28img.cfg
 delete mode 100644 arch/arm/mach-mxs/mxsimg.cfg

diff --git a/arch/arm/mach-mxs/mxs23img.cfg b/arch/arm/mach-mxs/mxs23img.cfg
new file mode 100644
index 0000000..34e8848
--- /dev/null
+++ b/arch/arm/mach-mxs/mxs23img.cfg
@@ -0,0 +1,6 @@
+SECTION 0x0 BOOTABLE
+ TAG LAST
+ LOAD     0x1000     @PREP@
+ CALL     0x1000     0x0
+ LOAD     0x40002000 @BOOTLOADER@
+ CALL     0x40002000 0x0
diff --git a/arch/arm/mach-mxs/mxs28img.cfg b/arch/arm/mach-mxs/mxs28img.cfg
new file mode 100644
index 0000000..0ff2c35
--- /dev/null
+++ b/arch/arm/mach-mxs/mxs28img.cfg
@@ -0,0 +1,8 @@
+SECTION 0x0 BOOTABLE
+ TAG LAST
+ LOAD     0x1000     @PREP@
+ LOAD IVT 0x8000     0x1000
+ CALL HAB 0x8000     0x0
+ LOAD     0x40002000 @BOOTLOADER@
+ LOAD IVT 0x8000     0x40002000
+ CALL HAB 0x8000     0x0
diff --git a/arch/arm/mach-mxs/mxsimg.cfg b/arch/arm/mach-mxs/mxsimg.cfg
deleted file mode 100644
index 0ff2c35..0000000
--- a/arch/arm/mach-mxs/mxsimg.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-SECTION 0x0 BOOTABLE
- TAG LAST
- LOAD     0x1000     @PREP@
- LOAD IVT 0x8000     0x1000
- CALL HAB 0x8000     0x0
- LOAD     0x40002000 @BOOTLOADER@
- LOAD IVT 0x8000     0x40002000
- CALL HAB 0x8000     0x0
diff --git a/images/Makefile.mxs b/images/Makefile.mxs
index 41db9c4..811345c 100644
--- a/images/Makefile.mxs
+++ b/images/Makefile.mxs
@@ -19,11 +19,12 @@ $(obj)/%.mxssd: $(obj)/%
 	$(call if_changed,mxs_sd)
 
 board = $(srctree)/arch/$(ARCH)/boards
-mxscfg = $(srctree)/arch/arm/mach-mxs/mxsimg.cfg
+mxs23cfg = $(srctree)/arch/arm/mach-mxs/mxs23img.cfg
+mxs28cfg = $(srctree)/arch/arm/mach-mxs/mxs28img.cfg
 
 pblx-$(CONFIG_MACH_TX28) += start_barebox_karo_tx28 prep_start_barebox_karo_tx28
 PREP_start_barebox_karo_tx28.pblx.mxsbs = start_barebox_karo_tx28_prep
-CFG_start_barebox_karo_tx28.mxsbs = $(mxscfg)
+CFG_start_barebox_karo_tx28.mxsbs = $(mxs28cfg)
 FILE_barebox-karo-tx28-bootstream.img = start_barebox_karo_tx28.mxsbs
 image-$(CONFIG_MACH_TX28) += barebox-karo-tx28-bootstream.img
 FILE_barebox-karo-tx28-sd.img = start_barebox_karo_tx28.mxsbs.mxssd
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2014-12-25 17:09 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-25 17:08 Jan Luebbe [this message]
2014-12-25 17:08 ` [PATCH 2/8] fixup! ARM: mxs: Add lowlevel setup from U-Boot Jan Luebbe
2014-12-25 17:09 ` [PATCH 3/8] " Jan Luebbe
2014-12-25 17:09 ` [PATCH 4/8] arm: mxs: fix pin voltage register value for EMI Jan Luebbe
2014-12-25 17:09 ` [PATCH 5/8] ARM: imx233-olinuxino: generate complete bootstream Jan Luebbe
2014-12-25 17:09 ` [PATCH 6/8] ARM: imx233-olinuxino: use LED1 as heartbeat Jan Luebbe
2014-12-25 17:09 ` [PATCH 7/8] ARM: imx233-olinuxino: update defaultenv Jan Luebbe
2014-12-25 17:09 ` [PATCH 8/8] ARM: imx233-olinuxino: update defconfig Jan Luebbe
2015-01-05 10:31 ` [PATCH 1/8] fixup! ARM: MXS: Add multiimage support Sascha Hauer

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=1419527345-9301-1-git-send-email-jlu@pengutronix.de \
    --to=jlu@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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