* [Buildroot] [-M] uboot: Added local directory as source of U-Boot code
@ 2014-11-11 16:17 Nicolas Serafini
2014-11-11 16:42 ` Vincent
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Serafini @ 2014-11-11 16:17 UTC (permalink / raw)
To: buildroot
Add the option to use a local directory as the source for building U-Boot.
This can be useful during development.
Signed-off-by: Nicolas Serafini <nicolas.serafini@sensefly.com>
---
boot/uboot/Config.in | 14 ++++++++++++++
boot/uboot/uboot.mk | 11 ++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
index 46d1109..ea929d9 100644
--- a/boot/uboot/Config.in
+++ b/boot/uboot/Config.in
@@ -34,6 +34,12 @@ config BR2_TARGET_UBOOT_CUSTOM_GIT
config BR2_TARGET_UBOOT_CUSTOM_HG
bool "Custom Mercurial repository"
+config BR2_TARGET_UBOOT_CUSTOM_LOCAL
+ bool "Custom local directory"
+ help
+ This option allows Buildroot to get the target U-Boot source
+ code from a local directory.
+
endchoice
config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE
@@ -44,6 +50,13 @@ config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
string "URL of custom U-Boot tarball"
depends on BR2_TARGET_UBOOT_CUSTOM_TARBALL
+config BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH
+ string "Path to the local directory"
+ depends on BR2_TARGET_UBOOT_CUSTOM_LOCAL
+ help
+ Path to the local directory with the target U-Boot source
+ code.
+
if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
@@ -69,6 +82,7 @@ config BR2_TARGET_UBOOT_VERSION
default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
default BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION \
if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
+ default "custom" if BR2_TARGET_UBOOT_CUSTOM_LOCAL
config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
string "custom patch dir"
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 1f8818c..fb7ceb3 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -12,11 +12,14 @@ UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt
UBOOT_INSTALL_IMAGES = YES
-ifeq ($(UBOOT_VERSION),custom)
+ifeq ($(BR2_TARGET_UBOOT_CUSTOM_TARBALL),y)
# Handle custom U-Boot tarballs as specified by the configuration
UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
+else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_LOCAL),y)
+UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH))
+UBOOT_SITE_METHOD = local
else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
UBOOT_SITE_METHOD = git
@@ -187,6 +190,12 @@ $(error No custom U-Boot tarball specified. Check your BR2_TARGET_UBOOT_CUSTOM_T
endif # qstrip BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
endif # BR2_TARGET_UBOOT_CUSTOM_TARBALL
+ifeq ($(BR2_TARGET_UBOOT_CUSTOM_LOCAL),y)
+ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH)),)
+$(error No custom U-Boot local path specified. Check your BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH setting)
+endif # qstrip BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH
+endif # BR2_TARGET_UBOOT_CUSTOM_LOCAL
+
ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT)$(BR2_TARGET_UBOOT_CUSTOM_HG),y)
ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),)
$(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting)
--
2.1.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [-M] uboot: Added local directory as source of U-Boot code
2014-11-11 16:17 [Buildroot] [-M] uboot: Added local directory as source of U-Boot code Nicolas Serafini
@ 2014-11-11 16:42 ` Vincent
2014-11-11 17:08 ` Nicolas Serafini
0 siblings, 1 reply; 3+ messages in thread
From: Vincent @ 2014-11-11 16:42 UTC (permalink / raw)
To: buildroot
On 11/11/2014 05:17 PM, Nicolas Serafini wrote:
> Add the option to use a local directory as the source for building U-Boot.
> This can be useful during development.
Hi Nicolas,
I wonder: is your patch implementing maybe the same feature as done by
the local.mk and an UBOOT_OVERRIDE_SRCDIR directive [1]?
Best regards,
V.
[1]
http://nightly.buildroot.org/manual.html#_using_buildroot_during_development
>
> Signed-off-by: Nicolas Serafini <nicolas.serafini@sensefly.com>
> ---
> boot/uboot/Config.in | 14 ++++++++++++++
> boot/uboot/uboot.mk | 11 ++++++++++-
> 2 files changed, 24 insertions(+), 1 deletion(-)
>
> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
> index 46d1109..ea929d9 100644
> --- a/boot/uboot/Config.in
> +++ b/boot/uboot/Config.in
> @@ -34,6 +34,12 @@ config BR2_TARGET_UBOOT_CUSTOM_GIT
> config BR2_TARGET_UBOOT_CUSTOM_HG
> bool "Custom Mercurial repository"
>
> +config BR2_TARGET_UBOOT_CUSTOM_LOCAL
> + bool "Custom local directory"
> + help
> + This option allows Buildroot to get the target U-Boot source
> + code from a local directory.
> +
> endchoice
>
> config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE
> @@ -44,6 +50,13 @@ config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
> string "URL of custom U-Boot tarball"
> depends on BR2_TARGET_UBOOT_CUSTOM_TARBALL
>
> +config BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH
> + string "Path to the local directory"
> + depends on BR2_TARGET_UBOOT_CUSTOM_LOCAL
> + help
> + Path to the local directory with the target U-Boot source
> + code.
> +
> if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
>
> config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
> @@ -69,6 +82,7 @@ config BR2_TARGET_UBOOT_VERSION
> default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
> default BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION \
> if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
> + default "custom" if BR2_TARGET_UBOOT_CUSTOM_LOCAL
>
> config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
> string "custom patch dir"
> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
> index 1f8818c..fb7ceb3 100644
> --- a/boot/uboot/uboot.mk
> +++ b/boot/uboot/uboot.mk
> @@ -12,11 +12,14 @@ UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt
>
> UBOOT_INSTALL_IMAGES = YES
>
> -ifeq ($(UBOOT_VERSION),custom)
> +ifeq ($(BR2_TARGET_UBOOT_CUSTOM_TARBALL),y)
> # Handle custom U-Boot tarballs as specified by the configuration
> UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
> UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
> UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
> +else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_LOCAL),y)
> +UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH))
> +UBOOT_SITE_METHOD = local
> else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
> UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
> UBOOT_SITE_METHOD = git
> @@ -187,6 +190,12 @@ $(error No custom U-Boot tarball specified. Check your BR2_TARGET_UBOOT_CUSTOM_T
> endif # qstrip BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
> endif # BR2_TARGET_UBOOT_CUSTOM_TARBALL
>
> +ifeq ($(BR2_TARGET_UBOOT_CUSTOM_LOCAL),y)
> +ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH)),)
> +$(error No custom U-Boot local path specified. Check your BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH setting)
> +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH
> +endif # BR2_TARGET_UBOOT_CUSTOM_LOCAL
> +
> ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT)$(BR2_TARGET_UBOOT_CUSTOM_HG),y)
> ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),)
> $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting)
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [-M] uboot: Added local directory as source of U-Boot code
2014-11-11 16:42 ` Vincent
@ 2014-11-11 17:08 ` Nicolas Serafini
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Serafini @ 2014-11-11 17:08 UTC (permalink / raw)
To: buildroot
Hi Vincent,
Le 11. 11. 14 17:42, Vincent a ?crit :
> On 11/11/2014 05:17 PM, Nicolas Serafini wrote:
>> Add the option to use a local directory as the source for building U-Boot.
>> This can be useful during development.
>
> Hi Nicolas,
>
> I wonder: is your patch implementing maybe the same feature as done by
> the local.mk and an UBOOT_OVERRIDE_SRCDIR directive [1]?
Yes sorry I did not know this possibility of package override. I'm going
to use this.
I was misled because the option of local source exist for the linux package.
Thanks for you response
Best regards
Nicolas
>
> Best regards,
>
> V.
>
> [1]
> http://nightly.buildroot.org/manual.html#_using_buildroot_during_development
>
>>
>> Signed-off-by: Nicolas Serafini <nicolas.serafini@sensefly.com>
>> ---
>> boot/uboot/Config.in | 14 ++++++++++++++
>> boot/uboot/uboot.mk | 11 ++++++++++-
>> 2 files changed, 24 insertions(+), 1 deletion(-)
>>
>> diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in
>> index 46d1109..ea929d9 100644
>> --- a/boot/uboot/Config.in
>> +++ b/boot/uboot/Config.in
>> @@ -34,6 +34,12 @@ config BR2_TARGET_UBOOT_CUSTOM_GIT
>> config BR2_TARGET_UBOOT_CUSTOM_HG
>> bool "Custom Mercurial repository"
>>
>> +config BR2_TARGET_UBOOT_CUSTOM_LOCAL
>> + bool "Custom local directory"
>> + help
>> + This option allows Buildroot to get the target U-Boot source
>> + code from a local directory.
>> +
>> endchoice
>>
>> config BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE
>> @@ -44,6 +50,13 @@ config BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
>> string "URL of custom U-Boot tarball"
>> depends on BR2_TARGET_UBOOT_CUSTOM_TARBALL
>>
>> +config BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH
>> + string "Path to the local directory"
>> + depends on BR2_TARGET_UBOOT_CUSTOM_LOCAL
>> + help
>> + Path to the local directory with the target U-Boot source
>> + code.
>> +
>> if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
>>
>> config BR2_TARGET_UBOOT_CUSTOM_REPO_URL
>> @@ -69,6 +82,7 @@ config BR2_TARGET_UBOOT_VERSION
>> default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL
>> default BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION \
>> if BR2_TARGET_UBOOT_CUSTOM_GIT || BR2_TARGET_UBOOT_CUSTOM_HG
>> + default "custom" if BR2_TARGET_UBOOT_CUSTOM_LOCAL
>>
>> config BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR
>> string "custom patch dir"
>> diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
>> index 1f8818c..fb7ceb3 100644
>> --- a/boot/uboot/uboot.mk
>> +++ b/boot/uboot/uboot.mk
>> @@ -12,11 +12,14 @@ UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt
>>
>> UBOOT_INSTALL_IMAGES = YES
>>
>> -ifeq ($(UBOOT_VERSION),custom)
>> +ifeq ($(BR2_TARGET_UBOOT_CUSTOM_TARBALL),y)
>> # Handle custom U-Boot tarballs as specified by the configuration
>> UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
>> UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
>> UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
>> +else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_LOCAL),y)
>> +UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH))
>> +UBOOT_SITE_METHOD = local
>> else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
>> UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
>> UBOOT_SITE_METHOD = git
>> @@ -187,6 +190,12 @@ $(error No custom U-Boot tarball specified. Check your BR2_TARGET_UBOOT_CUSTOM_T
>> endif # qstrip BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION
>> endif # BR2_TARGET_UBOOT_CUSTOM_TARBALL
>>
>> +ifeq ($(BR2_TARGET_UBOOT_CUSTOM_LOCAL),y)
>> +ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH)),)
>> +$(error No custom U-Boot local path specified. Check your BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH setting)
>> +endif # qstrip BR2_TARGET_UBOOT_CUSTOM_LOCAL_PATH
>> +endif # BR2_TARGET_UBOOT_CUSTOM_LOCAL
>> +
>> ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT)$(BR2_TARGET_UBOOT_CUSTOM_HG),y)
>> ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL)),)
>> $(error No custom U-Boot repository URL specified. Check your BR2_TARGET_UBOOT_CUSTOM_REPO_URL setting)
>>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-11-11 17:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-11 16:17 [Buildroot] [-M] uboot: Added local directory as source of U-Boot code Nicolas Serafini
2014-11-11 16:42 ` Vincent
2014-11-11 17:08 ` Nicolas Serafini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox