Commit 4bff6145 authored by Thomas De Schampheleire's avatar Thomas De Schampheleire Committed by Peter Korsgaard
Browse files

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: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent f2c2193b

boot/uboot/Config.in

+16 −16
Original line number Diff line number Diff line
@@ -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

linux/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -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.