[Buildroot] [PATCH 1/2] beaglebone: Use default U-Boot version

[Buildroot] [PATCH 1/2] beaglebone: Use default U-Boot version

[Ezequiel Garcia]

There's no reason to use a specific U-Boot version, given
we are using upstream. Leave the default version get selected.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
---
 configs/beaglebone_defconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index be803b9cce30..b9d78a9fb25b 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -20,8 +20,6 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="am335x_evm"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"
-- 
2.7.0

[Buildroot] [PATCH 2/2] beaglebone: Use genimage to produce the SD card image

[Ezequiel Garcia]

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
---
 board/beaglebone/post-image.sh | 14 ++++++++++++++
 board/beaglebone/readme.txt    | 30 +-----------------------------
 configs/beaglebone_defconfig   |  5 +++++
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/board/beaglebone/post-image.sh b/board/beaglebone/post-image.sh
index 7441d07a005c..ceeec6852092 100755
--- a/board/beaglebone/post-image.sh
+++ b/board/beaglebone/post-image.sh
@@ -2,5 +2,19 @@
 # post-image.sh for BeagleBone
 # 2014, Marcin Jabrzyk <marcin.jabrzyk@gmail.com>
 
+BOARD_DIR="$(dirname $0)"
+
 # copy the uEnv.txt to the output/images directory
 cp board/beaglebone/uEnv.txt $BINARIES_DIR/uEnv.txt
+
+GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage \
+    --rootpath "${TARGET_DIR}" \
+    --tmppath "${GENIMAGE_TMP}" \
+    --inputpath "${BINARIES_DIR}" \
+    --outputpath "${BINARIES_DIR}" \
+    --config "${GENIMAGE_CFG}"
diff --git a/board/beaglebone/readme.txt b/board/beaglebone/readme.txt
index 089c49a8ef89..43ebe53aee14 100644
--- a/board/beaglebone/readme.txt
+++ b/board/beaglebone/readme.txt
@@ -28,35 +28,7 @@ After building, you should get a tree like this:
   ??? am335x-bone.dtb
   ??? MLO
   ??? rootfs.ext2
+  ??? sdcard.img
   ??? u-boot.img
   ??? uEnv.txt
   ??? zImage
-
-
-Prepare your SDCard
-===================
-
-You need to prepare first partition in fat32 and marked as bootable,
-and second where you will write rootfs.
-
-Copy the files to boot partition
-
-  $ cp MLO u-boot.img zImage uEnv.txt *.dtb /media/zzzzz
-
-where /media/zzzzz is the mount point.
-Then you need to write the rootfs image onto SDCard:
-
-  # dd if=rootfs.ext2 of=/dev/xxxxx
-
-where /dev/xxxxx is the second partition. Use:
-
-  # fdisk -l
-
-to check for correct one.
-
-Finish
-======
-
-Unmount all mounted SDCard partitions and insert the card to BeagleBone.
-Hold the "BOOT" button and apply power. Then release the "BOOT" button.
-The output is available on the serial console.
diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index b9d78a9fb25b..f68ee9106af4 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -12,6 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"
 # filesystem
 BR2_PACKAGE_AM33X_CM3=y
 BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
 # Linux headers same as kernel, a 3.12 series
@@ -24,6 +25,10 @@ BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"
 
+# host packages
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-- 
2.7.0

[Buildroot] [PATCH 1/2] beaglebone: Use default U-Boot version

[Thomas Petazzoni]

Hello,

On Sat,  4 Jun 2016 18:29:08 -0300, Ezequiel Garcia wrote:
> There's no reason to use a specific U-Boot version, given
> we are using upstream. Leave the default version get selected.
> 
> Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>

No, that's not our policy. Our policy is to use a fixed version (even
if an upstream one) to make sure that people using the defconfig in the
future will have a known-working version.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] beaglebone: Use default U-Boot version

[Yann E. MORIN]

Thomas, Ezequiel, All,

On 2016-06-05 09:52 +0200, Thomas Petazzoni spake thusly:
> On Sat,  4 Jun 2016 18:29:08 -0300, Ezequiel Garcia wrote:
> > There's no reason to use a specific U-Boot version, given
> > we are using upstream. Leave the default version get selected.
> > 
> > Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
> 
> No, that's not our policy. Our policy is to use a fixed version (even
> if an upstream one) to make sure that people using the defconfig in the
> future will have a known-working version.

That may be my fault: we've discussed this with Ezequiel on IRC, and
from what I understood, it looked he was askign why we were not using an
upstream version.

So, I replied that we can use upstream, of course, if upstream has the
necessary support.

Maybe I was not clear enough: we can use upstream, but a fixed version,
of course.

If 2013.10 is too old, you can bump (e.g. to 2015.10 or whatever, even a
sha1 from the git tree if necessary). But that should be a fixed
version, indeed.

Sorry for the confusion... :-/

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 1/2] beaglebone: Use default U-Boot version

[Ezequiel Garcia]

On 5 June 2016 at 18:54, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Thomas, Ezequiel, All,
>
> On 2016-06-05 09:52 +0200, Thomas Petazzoni spake thusly:
>> On Sat,  4 Jun 2016 18:29:08 -0300, Ezequiel Garcia wrote:
>> > There's no reason to use a specific U-Boot version, given
>> > we are using upstream. Leave the default version get selected.
>> >
>> > Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
>>
>> No, that's not our policy. Our policy is to use a fixed version (even
>> if an upstream one) to make sure that people using the defconfig in the
>> future will have a known-working version.
>
> That may be my fault: we've discussed this with Ezequiel on IRC, and
> from what I understood, it looked he was askign why we were not using an
> upstream version.
>
> So, I replied that we can use upstream, of course, if upstream has the
> necessary support.
>
> Maybe I was not clear enough: we can use upstream, but a fixed version,
> of course.
>
> If 2013.10 is too old, you can bump (e.g. to 2015.10 or whatever, even a
> sha1 from the git tree if necessary). But that should be a fixed
> version, indeed.
>
> Sorry for the confusion... :-/
>

No problem, no need for apologies :-)

I'll cook a new patch in no time.
-- 
Ezequiel Garc?a, VanguardiaSur
www.vanguardiasur.com.ar

[Buildroot] [PATCH v2] beaglebone: Bump U-Boot version

[Ezequiel Garcia]

Currently selected version of U-Boot fails to compile.
Dying words are:

  gcc -g -O2 -I/home/zeta/buildroot/buildroot/output/host/usr/include -c -o env_embedded.o /home/zeta/buildroot/buildroot/output/build/uboot-2013.10/common/env_embedded.c
  /home/zeta/buildroot/buildroot/output/build/uboot-2013.10/lib/crc32.c:14:20: fatal error: common.h: No such file or directory
  compilation terminated.
  Makefile:258: recipe for target 'crc32.o' failed

Since it's quite old, instead of trying to fix it, let's
just upgrade.

Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
---
Changes from v1:

  * Bump to a specific version instead of using the default.

 configs/beaglebone_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index d44636173264..206417dc1cce 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -22,7 +22,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_12=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="am335x_evm"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="MLO"
-- 
2.7.0

[Buildroot] [PATCH 2/2] beaglebone: Use genimage to produce the SD card image

[Thomas Petazzoni]

Hello,

On Sat,  4 Jun 2016 18:29:09 -0300, Ezequiel Garcia wrote:
> Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>

I've tweaked the title prefix to configs/beaglebone

> +# host packages
> +BR2_PACKAGE_HOST_MTOOLS=y
> +BR2_PACKAGE_HOST_GENIMAGE=y

You also need host dosfstools for genimage to work when a FAT
filesystem needs to be generated. I've added it to the defconfig and
applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH v2] beaglebone: Bump U-Boot version

[Thomas Petazzoni]

Hello,

On Mon,  6 Jun 2016 14:05:35 -0300, Ezequiel Garcia wrote:
> Currently selected version of U-Boot fails to compile.
> Dying words are:
> 
>   gcc -g -O2 -I/home/zeta/buildroot/buildroot/output/host/usr/include -c -o env_embedded.o /home/zeta/buildroot/buildroot/output/build/uboot-2013.10/common/env_embedded.c
>   /home/zeta/buildroot/buildroot/output/build/uboot-2013.10/lib/crc32.c:14:20: fatal error: common.h: No such file or directory
>   compilation terminated.
>   Makefile:258: recipe for target 'crc32.o' failed
> 
> Since it's quite old, instead of trying to fix it, let's
> just upgrade.
> 
> Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
> ---
> Changes from v1:

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com