[PATCH 1/2] beaglebone.wks: Add beaglebone wic template

[PATCH 1/2] beaglebone.wks: Add beaglebone wic template

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 wic/beaglebone.wks | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 wic/beaglebone.wks

diff --git a/wic/beaglebone.wks b/wic/beaglebone.wks
new file mode 100644
index 00000000..b75f238d
--- /dev/null
+++ b/wic/beaglebone.wks
@@ -0,0 +1,6 @@
+# short-description: Create SD card image for Beaglebone
+# long-description: Creates a partitioned SD card image for Beaglebone.
+# Boot files are located in the first vfat partition.
+
+part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4 --size 16 --sourceparams="loader=u-boot" --use-uuid
+part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4 --use-uuid
-- 
2.19.1

[PATCH 2/2] beaglebone.conf: Switch u-boot provider to mainline from oe-core

[Khem Raj]

use beaglebone specific wic template

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/machine/beaglebone.conf | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
index 49edfd61..25b9998a 100644
--- a/conf/machine/beaglebone.conf
+++ b/conf/machine/beaglebone.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
 #@NAME: BeagleBone machine
-#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 
+#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
 
 require conf/machine/include/ti33x.inc
 
@@ -11,15 +11,25 @@ KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \
 # Only has DVI connector for external screen
 MACHINE_GUI_CLASS = "bigscreen"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
 
 UBOOT_MACHINE = "am335x_boneblack_config"
 
-WKS_FILE = "sdimage-bootpart.wks"
-IMAGE_BOOT_FILES = "MLO u-boot.img"
-IMAGE_FSTYPES += "tar.xz wic.xz"
+WKS_FILE = "beaglebone.wks"
 
-do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO zImage am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
+
+IMAGE_FSTYPES += "tar.xz wic.xz"
 
 # Refine the list of device targets for ti-pdk class recipes
 TI_PDK_LIMIT_BOARDS = "bbbAM335x"
+
+SPL_BINARY = "MLO"
+UBOOT_SUFFIX = "img"
+
+IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
+
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+PREFERRED_PROVIDER_u-boot = "u-boot"
+
-- 
2.19.1

Re: [PATCH 2/2] beaglebone.conf: Switch u-boot provider to mainline from oe-core

[Denys Dmytriyenko]

This is should be a less dramatic workaround for now :)
https://lists.yoctoproject.org/pipermail/meta-ti/2018-October/011363.html

Thanks for confirming SPL breakage with am335x_beaglebone_config


On Fri, Oct 12, 2018 at 06:57:21PM -0700, Khem Raj wrote:
> use beaglebone specific wic template
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  conf/machine/beaglebone.conf | 22 ++++++++++++++++------
>  1 file changed, 16 insertions(+), 6 deletions(-)
> 
> diff --git a/conf/machine/beaglebone.conf b/conf/machine/beaglebone.conf
> index 49edfd61..25b9998a 100644
> --- a/conf/machine/beaglebone.conf
> +++ b/conf/machine/beaglebone.conf
> @@ -1,6 +1,6 @@
>  #@TYPE: Machine
>  #@NAME: BeagleBone machine
> -#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board 
> +#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
>  
>  require conf/machine/include/ti33x.inc
>  
> @@ -11,15 +11,25 @@ KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \
>  # Only has DVI connector for external screen
>  MACHINE_GUI_CLASS = "bigscreen"
>  
> -SERIAL_CONSOLE = "115200 ttyS0"
> +SERIAL_CONSOLES = "115200;ttyS0 115200;ttyO0"
>  
>  UBOOT_MACHINE = "am335x_boneblack_config"
>  
> -WKS_FILE = "sdimage-bootpart.wks"
> -IMAGE_BOOT_FILES = "MLO u-boot.img"
> -IMAGE_FSTYPES += "tar.xz wic.xz"
> +WKS_FILE = "beaglebone.wks"
>  
> -do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
> +IMAGE_BOOT_FILES ?= "u-boot.${UBOOT_SUFFIX} MLO zImage am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
> +
> +IMAGE_FSTYPES += "tar.xz wic.xz"
>  
>  # Refine the list of device targets for ti-pdk class recipes
>  TI_PDK_LIMIT_BOARDS = "bbbAM335x"
> +
> +SPL_BINARY = "MLO"
> +UBOOT_SUFFIX = "img"
> +
> +IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
> +do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot"
> +
> +PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
> +PREFERRED_PROVIDER_u-boot = "u-boot"
> +
> -- 
> 2.19.1
> 
> -- 
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti