summaryrefslogtreecommitdiffstats
path: root/boot/uboot/Config.in
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2013-07-14 23:56:45 +0000
committerbnewbold <bnewbold@robocracy.org>2013-07-14 23:56:45 +0000
commit6b2a0e0c9b297396a9c0841905fa31275a38a0e3 (patch)
treed064c70cea5ffb3b026d5896ee3494e6996a78a6 /boot/uboot/Config.in
parent4ddff0099fa0619cfd1bcf5afa96f56a703de385 (diff)
downloadbuildroot-novena-6b2a0e0c9b297396a9c0841905fa31275a38a0e3.tar.gz
buildroot-novena-6b2a0e0c9b297396a9c0841905fa31275a38a0e3.zip
u-boot: workaround for setlocalversion issue
The u-boot build process attempts to determine the version number using git commands, which assumes that the build is taking place in a git checkout with the .git directory intact. The buildroot build process does a git checkout, but then exports a .tar.gz as a cache and does the build from that tarball (with no .git file). In some instances, being unable to determine the current version causes the build process to generate a non-functional bootloader. This patch implements a work-around for this problem by allowing the user to configure a 'localverion' override which gets written to the ./localversion file in the u-boot build directory, which is later used by the ./tools/setlocalversion script.
Diffstat (limited to 'boot/uboot/Config.in')
-rw-r--r--boot/uboot/Config.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index aadf75707..6b2fa47d0 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -68,6 +68,9 @@ config BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL
config BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION
string "Custom Git version"
+config BR2_TARGET_UBOOT_CUSTOM_GIT_LOCALVERSION
+ string "Custom 'localversion' (to override setlocalversion)"
+
endif
choice
@@ -94,6 +97,10 @@ config BR2_TARGET_UBOOT_FORMAT_KWB
depends on BR2_arm
bool "u-boot.kwb (Marvell)"
+config BR2_TARGET_UBOOT_FORMAT_IMX
+ depends on BR2_arm
+ bool "u-boot.imx (Freescale)"
+
config BR2_TARGET_UBOOT_FORMAT_LDR
depends on BR2_bfin
bool "u-boot.ldr"