wandboard: Use HTTP for accessing Linux kernel and U-Boot git repos
diff mbox

Message ID 1467099927-32036-1-git-send-email-abrodkin@synopsys.com
State Accepted
Commit 56d785a1ffeecc3235541a51a489c3eed5f369fd
Headers show

Commit Message

Alexey Brodkin June 28, 2016, 7:45 a.m. UTC
Quite often these days Git ports are blocked by firewalls
[this is especially true in corporate environment] so switching
to common HTTP(s) is a safe and pretty convenient move.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Stephan Hoffmann <sho@relinux.de>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Sergio Prado <sergio.prado@e-labworks.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
---
 configs/wandboard_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Peter Korsgaard June 28, 2016, 8:26 a.m. UTC | #1
>>>>> "Alexey" == Alexey Brodkin <Alexey.Brodkin@synopsys.com> writes:

 > Quite often these days Git ports are blocked by firewalls
 > [this is especially true in corporate environment] so switching
 > to common HTTP(s) is a safe and pretty convenient move.

 > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
 > Cc: Stephan Hoffmann <sho@relinux.de>
 > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 > Cc: Sergio Prado <sergio.prado@e-labworks.com>
 > Cc: Peter Korsgaard <peter@korsgaard.com>
 > ---
 >  configs/wandboard_defconfig | 4 ++--
 >  1 file changed, 2 insertions(+), 2 deletions(-)

Committed, thanks.

 > -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.denx.de/u-boot.git"
 > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="http://git.denx.de/u-boot.git"

This is actually just the 2015.07 release:

git describe 33711bdd4a4dce942fb5ae85a68899a8357bdd94
v2015.07

So I've changed it to use the release tarball instead.
Alexey Brodkin June 28, 2016, 8:28 a.m. UTC | #2
Hi Peter,

On Tue, 2016-06-28 at 10:26 +0200, Peter Korsgaard wrote:
> > 
> > > 
> > > > 
> > > > > 
> > > > > > 
> > > > > > "Alexey" == Alexey Brodkin <Alexey.Brodkin@synopsys.com> writes:
>  > Quite often these days Git ports are blocked by firewalls
>  > [this is especially true in corporate environment] so switching
>  > to common HTTP(s) is a safe and pretty convenient move.
> 
>  > Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
>  > Cc: Stephan Hoffmann <sho@relinux.de>
>  > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>  > Cc: Sergio Prado <sergio.prado@e-labworks.com>
>  > Cc: Peter Korsgaard <peter@korsgaard.com>
>  > ---
>  >  configs/wandboard_defconfig | 4 ++--
>  >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Committed, thanks.
> 
>  > -BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.denx.de/u-boot.git"
>  > +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="http://git.denx.de/u-boot.git"
> 
> This is actually just the 2015.07 release:
> 
> git describe 33711bdd4a4dce942fb5ae85a68899a8357bdd94
> v2015.07
> 
> So I've changed it to use the release tarball instead.

Thanks for that.

Now I'm trying to get Wandboard working from the most recent upstream
kernel and U-Boot. If it all works I'll update that defconfig again :)

-Alexey
Peter Korsgaard June 28, 2016, 8:57 a.m. UTC | #3
>>>>> "Alexey" == Alexey Brodkin <Alexey.Brodkin@synopsys.com> writes:

 >> So I've changed it to use the release tarball instead.

 > Thanks for that.

 > Now I'm trying to get Wandboard working from the most recent upstream
 > kernel and U-Boot. If it all works I'll update that defconfig again :)

Great, thanks!
Alexey Brodkin July 4, 2016, 9:54 a.m. UTC | #4
Hi Peter,

On Tue, 2016-06-28 at 10:57 +0200, Peter Korsgaard wrote:
> > 
> > > 
> > > > 
> > > > > 
> > > > > > 
> > > > > > "Alexey" == Alexey Brodkin <Alexey.Brodkin@synopsys.com> writes:
>  >> So I've changed it to use the release tarball instead.
> 
>  > Thanks for that.
> 
>  > Now I'm trying to get Wandboard working from the most recent upstream
>  > kernel and U-Boot. If it all works I'll update that defconfig again :)
> 
> Great, thanks!

So I wanted to do another fixup to Wandboard very similar to what I did
for Cubieboard but looks like it requires patching of U-Boot.

What happens with the most recent U-Boot (I think I tried 2016.05 and 2016.07-rc2)
in Buildroot U-Boot's image happens to be a little bit too large.

Wandboard's SD-card layout is as follows:
1. SPL with offset 1k
2. U-Boot itself with offset 69k
3. U-Boot's environment with offset 384k

And because of u-boot.img being 323032 bytes long it simply doesn't fit in
those 315kB left before U-Boot env. That's what I see in my build console:
-------------------------->8-----------------------
hdimage(sdcard.img): part u-boot-env overlaps with previous partition
Makefile:672: recipe for target 'target-post-image' failed
make[1]: *** [target-post-image] Error 1
Makefile:16: recipe for target '_all' failed
make: *** [_all] Error 2
-------------------------->8-----------------------

Note here we cannot fix the issue with changes in "board/wandboard/genimage.cfg"
because U-Boot's environment position is hardcoded in U-Boot's "include/configs/wandboard.h",
see http://git.denx.de/?p=u-boot.git;a=blob;f=include/configs/wandboard.h#l184

Let me discuss this problem on U-Boot's mailing list first and then we either
backport upstream patch or we'll cook something out if the tree.

Interesting enough if I compile U-Boot for WB form the same sources but with ARM
toolchian available in my Fedora 23 host distro u-boot.img becomes a little bit more
compact and squeezes in its "partition" in SD-card image.

-Alexey
Peter Korsgaard July 4, 2016, 12:41 p.m. UTC | #5
>>>>> "Alexey" == Alexey Brodkin <Alexey.Brodkin@synopsys.com> writes:

Hi,

 > So I wanted to do another fixup to Wandboard very similar to what I did
 > for Cubieboard but looks like it requires patching of U-Boot.

 > What happens with the most recent U-Boot (I think I tried 2016.05 and 2016.07-rc2)
 > in Buildroot U-Boot's image happens to be a little bit too large.

 > Wandboard's SD-card layout is as follows:
 > 1. SPL with offset 1k
 > 2. U-Boot itself with offset 69k
 > 3. U-Boot's environment with offset 384k

:/

 > And because of u-boot.img being 323032 bytes long it simply doesn't fit in
 > those 315kB left before U-Boot env. That's what I see in my build console:
 --------------------------> 8-----------------------
 > hdimage(sdcard.img): part u-boot-env overlaps with previous partition
 > Makefile:672: recipe for target 'target-post-image' failed
 > make[1]: *** [target-post-image] Error 1
 > Makefile:16: recipe for target '_all' failed
 > make: *** [_all] Error 2
 --------------------------> 8-----------------------

 > Note here we cannot fix the issue with changes in "board/wandboard/genimage.cfg"
 > because U-Boot's environment position is hardcoded in U-Boot's "include/configs/wandboard.h",
 > see http://git.denx.de/?p=u-boot.git;a=blob;f=include/configs/wandboard.h#l184

 > Let me discuss this problem on U-Boot's mailing list first and then we either
 > backport upstream patch or we'll cook something out if the tree.

Yes, please - It really sounds like an upstream issue.

 > Interesting enough if I compile U-Boot for WB form the same sources but with ARM
 > toolchian available in my Fedora 23 host distro u-boot.img becomes a little bit more
 > compact and squeezes in its "partition" in SD-card image.

Ok, but presumably it is still a very tight fit, so if newer u-boot
versions becomes just a little bit more bloated it will break there as
well.

Patch
diff mbox

diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig
index cf71eb2..d616d0e 100644
--- a/configs/wandboard_defconfig
+++ b/configs/wandboard_defconfig
@@ -12,7 +12,7 @@  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_USE_DEFCONFIG=y
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="wandboard"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.denx.de/u-boot.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="http://git.denx.de/u-boot.git"
 BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="33711bdd4a4dce942fb5ae85a68899a8357bdd94"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.img"
@@ -23,7 +23,7 @@  BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/wandboard/uboot-env.txt"
 BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x2000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://github.com/wandboard-org/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/wandboard-org/linux"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="e2213f9a98dd7413ee5a9ca40cf60e8cb8292f4a"
 BR2_LINUX_KERNEL_DEFCONFIG="wandboard"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y