aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorGravatar Thomas De Schampheleire <patrickdepinguin+buildroot@gmail.com>2013-09-02 22:07:56 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2013-10-27 08:09:01 +0100
commit4bff614528a189db82e6388604328c3dfdf4a62c (patch)
tree219a0a3158505cb4cc9ccf856a9250d5cceae08d /boot
parentf2c2193b0571c2f15a430edf5c179b20914d0a95 (diff)
downloadbuildroot-4bff614528a189db82e6388604328c3dfdf4a62c.tar.gz
buildroot-4bff614528a189db82e6388604328c3dfdf4a62c.tar.bz2
linux/uboot: line-up repository-related configuration options
Although the configuration options for custom repository locations and versions are very similar between the linux and uboot packages, there are some minor differences. This patch lines up both packages. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'boot')
-rw-r--r--boot/uboot/Config.in32
1 files changed, 16 insertions, 16 deletions
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 8e71886e22..af9ccab9ab 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -40,10 +40,24 @@ config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE
string "U-Boot version"
depends on BR2_TARGET_UBOOT_CUSTOM_VERSION
-if BR2_TARGET_UBOOT_CUSTOM_TARBALL
-
config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
string "URL of custom U-Boot tarball"
+ depends on BR2_TARGET_UBOOT_CUSTOM_TARBALL
+
+if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
+
+config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
+ string "URL of custom repository"
+ default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \
+ if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" # legacy
+
+config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
+ string "Custom repository version"
+ default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \
+ if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" # legacy
+ help
+ Revision to use in the typical format used by Git/Mercurial
+ E.G. a sha id, a tag, branch, ..
endif
@@ -65,20 +79,6 @@ config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
Most users may leave this empty
-if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
-
-config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
- string "URL of custom repository"
- default BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL \
- if BR2_TARGET_UBOOT_CUSTOM_GIT_REPO_URL != "" # legacy
-
-config BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION
- string "Custom repository version"
- default BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION \
- if BR2_TARGET_UBOOT_CUSTOM_GIT_VERSION != "" # legacy
-
-endif
-
choice
prompt "U-Boot binary format"
default BR2_TARGET_UBOOT_FORMAT_BIN