From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001
From: takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>
Date: Mon, 2 Nov 2020 11:07:33 +0900
Subject: basesystem-jj recipes

---
 bsp/meta-sancloud/conf/machine/bbe.conf | 44 +++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 16 deletions(-)

(limited to 'bsp/meta-sancloud/conf/machine/bbe.conf')

diff --git a/bsp/meta-sancloud/conf/machine/bbe.conf b/bsp/meta-sancloud/conf/machine/bbe.conf
index cc58b098..da9e1026 100644
--- a/bsp/meta-sancloud/conf/machine/bbe.conf
+++ b/bsp/meta-sancloud/conf/machine/bbe.conf
@@ -2,35 +2,47 @@
 #@NAME: SanCloud BeagleBone Enhanced Development Board
 #@DESCRIPTION: Machine configuration for the BeagleBone Enhanced http://www.sancloud.co.uk/?page_id=254 Board
 
+################################################################################
+# Basic machine config
+
 MACHINEOVERRIDES =. "beaglebone:"
+
+IMAGE_FSTYPES += "wic.bmap"
+WKS_FILE ?= "sancloud_bbe.wks"
+
 require conf/machine/include/ti33x.inc
 
+MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "u-boot-script-bbe"
+
 MACHINE_EXTRA_RDEPENDS += " \
     kernel-modules linux-firmware-rtl8723 usbutils \
-    iw crda rtl8723bu kernel-module-8723bu \
+    iw wireless-regdb-static rtl8723bu kernel-module-8723bu \
     "
-ARAGO_IMAGE_EXTRA_INSTALL += "packagegroup-base"
+SERIAL_CONSOLE = "115200 ttyS0"
 
-EXTRA_IMAGEDEPENDS += "u-boot-bbe"
+################################################################################
+# U-boot
 
-IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
-WKS_FILE ?= "sancloud_bbe.wks"
-do_image_wic[depends] += "u-boot-bbe:do_build"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 
-SERIAL_CONSOLE = "115200 ttyS0"
+SPL_BINARY = "MLO"
+UBOOT_SUFFIX = "img"
+UBOOT_MACHINE = "am335x_evm_config"
+
+EXTRA_IMAGEDEPENDS += "u-boot"
 
-BBE_RT_KERNEL ??= "0"
-PREFERRED_PROVIDER_virtual/kernel_bbe = '${@oe.utils.conditional("BBE_RT_KERNEL","1","linux-bbe-rt","linux-bbe",d)}'
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bbe"
-PREFERRED_PROVIDER_u-boot = "u-boot-bbe"
+################################################################################
+# Kernel
 
 KERNEL_DEVICETREE = " \
     am335x-sancloud-bbe.dtb \
-    am335x-sancloud-bbei-wifi.dtb \
-    am335x-sancloud-bbe-icu4.dtb \
     "
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
-SPL_BINARY = "MLO"
-UBOOT_SUFFIX = "img"
-UBOOT_MACHINE = "am335x_evm_config"
+BBE_KERNEL_PROVIDER ??= "ti"
+require conf/machine/include/bbe-kernel-${BBE_KERNEL_PROVIDER}.inc
+
+################################################################################
+# Arago distro support
+
+ARAGO_IMAGE_EXTRA_INSTALL += "packagegroup-base"
-- 
cgit 1.2.3-korg