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>

diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 8e71886e22444d01f0b7a478c0e5bcfa75fd5c5a..af9ccab9abeed99ddf33fe1101ccee1c25fa338f 100644 (file)
--- 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

diff --git a/linux/Config.in b/linux/Config.in
index a12102adf0411622956942326ae6eef2b8479017..32426a328c1c9bf1aa8b65e783571f92076e6328 100644 (file)
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -47,7 +47,7 @@ config BR2_LINUX_KERNEL_CUSTOM_TARBALL
          specific kernel source tarball
 
 config BR2_LINUX_KERNEL_CUSTOM_GIT
-       bool "Custom Git tree"
+       bool "Custom Git repository"
        help
          This option allows Buildroot to get the Linux kernel source
          code from a Git repository.