* [Buildroot] [git commit master 1/1] u-boot: add Marvell u-boot.kwb support @ 2010-07-26 14:14 Peter Korsgaard 2010-07-26 20:31 ` Ossy 0 siblings, 1 reply; 3+ messages in thread From: Peter Korsgaard @ 2010-07-26 14:14 UTC (permalink / raw) To: buildroot commit: http://git.buildroot.net/buildroot/commit/?id=3cd5174ed796400a9566c0ea52f3551cba52bfe0 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master Marvell boards like the sheevaplug needs a special .kwb image format, so add an option for it similar to how we handle zImage/uImage/.. for the kernel. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> --- boot/u-boot/Config.in | 12 ++++++++++++ boot/u-boot/u-boot.mk | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index d445145..ce79a8a 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -57,6 +57,18 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR Most users may leave this empty +choice + prompt "U-Boot binary format" + +config BR2_TARGET_UBOOT_FORMAT_BIN + bool "u-boot.bin" + +config BR2_TARGET_UBOOT_FORMAT_KWB + depends on BR2_arm + bool "u-boot.kwb (Marvell)" + +endchoice + config BR2_TARGET_UBOOT_TOOL_MKIMAGE bool "mkimage tool in target" help diff --git a/boot/u-boot/u-boot.mk b/boot/u-boot/u-boot.mk index c21166f..60a4676 100644 --- a/boot/u-boot/u-boot.mk +++ b/boot/u-boot/u-boot.mk @@ -27,7 +27,13 @@ endif U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION) U_BOOT_CAT:=$(BZCAT) + +ifeq ($(BR2_TARGET_UBOOT_FORMAT_KWB),y) +U_BOOT_BIN:=u-boot.kwb +U_BOOT_MAKE_OPT:=$(U_BOOT_BIN) +else U_BOOT_BIN:=u-boot.bin +endif MKIMAGE:=$(HOST_DIR)/usr/bin/mkimage @@ -124,7 +130,7 @@ $(U_BOOT_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/.header_modified LDFLAGS="$(TARGET_LDFLAGS)" \ $(U_BOOT_CONFIGURE_OPTS) \ $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(U_BOOT_ARCH) \ - -C $(U_BOOT_DIR) + $(U_BOOT_MAKE_OPT) -C $(U_BOOT_DIR) # Copy the result to the images/ directory $(BINARIES_DIR)/$(U_BOOT_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN) -- 1.7.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [git commit master 1/1] u-boot: add Marvell u-boot.kwb support 2010-07-26 14:14 [Buildroot] [git commit master 1/1] u-boot: add Marvell u-boot.kwb support Peter Korsgaard @ 2010-07-26 20:31 ` Ossy 2010-07-26 20:47 ` Peter Korsgaard 0 siblings, 1 reply; 3+ messages in thread From: Ossy @ 2010-07-26 20:31 UTC (permalink / raw) To: buildroot Am 26.07.2010 16:14, schrieb Peter Korsgaard: > > commit: http://git.buildroot.net/buildroot/commit/?id=3cd5174ed796400a9566c0ea52f3551cba52bfe0 > branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master > > Marvell boards like the sheevaplug needs a special .kwb image format, > so add an option for it similar to how we handle zImage/uImage/.. > for the kernel. > Just for documentation if someone searches the mailingarchive: I run a plain vanilla u-boot with a minor patch in bin-format on my seagate dockstar (sheevaplug with less memory). But this is chainloaded by the proprietary u-boot. So at least for this configuration you are not forced to use the .kwb format. @Peter: Please note my patch for applying patches to u-boot. The current git tree includes a typo. I corrected it and submitted the patch more than once to the mailinglist (see attachement). The solution is rather forward and the patch is tested (only two modified lines). Kind regards, Marcus -------------- next part -------------- An embedded message was scrubbed... From: Ossy <ossy1980@gmx.net> Subject: [Buildroot] [PATCH] apply custom patches correctly to u-boot Date: Wed, 07 Jul 2010 22:55:55 +0200 Size: 6342 URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20100726/6fc01c14/attachment-0001.mht> ^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [git commit master 1/1] u-boot: add Marvell u-boot.kwb support 2010-07-26 20:31 ` Ossy @ 2010-07-26 20:47 ` Peter Korsgaard 0 siblings, 0 replies; 3+ messages in thread From: Peter Korsgaard @ 2010-07-26 20:47 UTC (permalink / raw) To: buildroot >>>>> "Ossy" == Ossy <ossy1980@gmx.net> writes: Hi, Ossy> Just for documentation if someone searches the mailingarchive: Ossy> I run a plain vanilla u-boot with a minor patch in bin-format on my Ossy> seagate dockstar (sheevaplug with less memory). But this is Ossy> chainloaded by the proprietary u-boot. So at least for this Ossy> configuration you are not forced to use the .kwb format. Ok. u-boot.kwb is in mainline u-boot so it isn't a big issue. Ossy> @Peter: Ossy> Please note my patch for applying patches to u-boot. The current git Ossy> tree includes a typo. I corrected it and submitted the patch more than Ossy> once to the mailinglist (see attachement). Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-26 20:47 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-07-26 14:14 [Buildroot] [git commit master 1/1] u-boot: add Marvell u-boot.kwb support Peter Korsgaard 2010-07-26 20:31 ` Ossy 2010-07-26 20:47 ` Peter Korsgaard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox