switched to poky scarthgap

.gitmodules

@@ -10,3 +10,7 @@
 	path = layers/meta-ti
 	url = git://git.yoctoproject.org/meta-ti
 	branch = scarthgap
+[submodule "layers/meta-openembedded"]
+	path = layers/meta-openembedded
+	url = https://github.com/openembedded/meta-openembedded.git
+	branch = scarthgap

build/conf/bblayers.conf

@@ -11,6 +11,8 @@ BBLAYERS ?= " \
   /home/yocto/ws/poky/meta-yocto-bsp \
   /home/yocto/ws/layers/meta-arm/meta-arm \
   /home/yocto/ws/layers/meta-arm/meta-arm-toolchain \
+  /home/yocto/ws/layers/meta-devdistro \
+  /home/yocto/ws/layers/meta-openembedded/meta-oe \
   /home/yocto/ws/layers/meta-ti/meta-beagle \
   /home/yocto/ws/layers/meta-ti/meta-ti-bsp \
   /home/yocto/ws/layers/meta-ti/meta-ti-extras \

build/conf/local.conf

@@ -36,7 +36,7 @@
 #MACHINE ?= "genericx86-64"
 #
 # This sets the default machine to be qemux86-64 if no other machine is selected:
-MACHINE ??= "beagleplay"
+MACHINE = "beagleplay"
 
 # These are some of the more commonly used values. Looking at the files in the
 # meta/conf/machine directory, or the conf/machine directory of any additional layers
@@ -91,7 +91,7 @@ MACHINE ??= "beagleplay"
 # Ultimately when creating custom policy, people will likely end up subclassing 
 # these defaults.
 #
-DISTRO ?= "poky"
+DISTRO ?= "devdistro"
 # As an example of a subclass there is a "bleeding" edge policy configuration
 # where many versions are set to the absolute latest code from the upstream 
 # source control systems. This is just mentioned here as an example, its not
@@ -147,7 +147,6 @@ DISTRO ?= "poky"
 # meta/classes-recipe/core-image.bbclass for more details.
 # We default to enabling the debugging tweaks.
 EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
-IMAGE_INSTALL:append = " vim apt"
 
 #
 # Additional image features

doc/boot0.txt

@@ -0,0 +1,5 @@
+File         | Offset (hex) | Seek (sectors) | Block Size | Command
+-------------|--------------|----------------|------------|----------------------------------------------------------
+tiboot3.bin  | 0x0          | 0              | 512        | dd if=tiboot3.bin of=/dev/mmcblk0boot0 seek=0 bs=512
+tispl.bin    | 0x80000      | 1024           | 512        | dd if=tispl.bin of=/dev/mmcblk0boot0 seek=1024 bs=512
+u-boot.img   | 0x280000     | 5120           | 512        | dd if=u-boot.img of=/dev/mmcblk0boot0 seek=5120 bs=512

layers/meta-devdistro/conf/distro/devdistro.conf

@@ -0,0 +1,38 @@
+DISTRO = "devdistro"
+DISTRO_NAME = "Custom Headless Distro for development"
+DISTRO_VERSION = "1.0"
+
+EFI_PROVIDER = ""
+
+PREFERRED_PROVIDER_virtual/bootloader:beagleplay = "u-boot-ti-staging"
+UBOOT_MACHINE:beagleplay = "am62x_beagleplay_a53_custom_defconfig"
+KERNEL_DEVICETREE:append:beagleplay = " overlays/am62x_enable_m4f.dtbo"
+WKS_FILE:beagleplay = "sdimage-2part.wks"
+
+# Use systemd (recommended for networking & ssh)
+DISTRO_FEATURES:append = "\
+    systemd \
+    usrmerge \
+    ipv4 \
+    ipv6 \
+"
+
+VIRTUAL-RUNTIME_init_manager = "systemd"
+VIRTUAL-RUNTIME_initscripts = ""
+DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
+
+# Explicitly remove graphics
+DISTRO_FEATURES:remove = "\
+    x11 \
+    wayland \
+    opengl \
+    directfb \
+"
+
+# No display-related features
+DISTRO_FEATURES_BACKFILL_CONSIDERED += "\
+    x11 wayland opengl directfb \
+"
+
+# Avoid pulling graphics via dependencies
+PACKAGECONFIG:remove:pn-qemu-system-native = "sdl gtk"

layers/meta-devdistro/conf/layer.conf

@@ -0,0 +1,16 @@
+# Add layer to BitBake search path
+BBPATH .= ":${LAYERDIR}"
+
+# Where recipes live
+BBFILES += "\
+    ${LAYERDIR}/recipes-*/*/*.bb \
+    ${LAYERDIR}/recipes-*/*/*.bbappend \
+"
+
+# Layer identification (REQUIRED)
+BBFILE_COLLECTIONS += "devdistro"
+BBFILE_PATTERN_devdistro = "^${LAYERDIR}/"
+BBFILE_PRIORITY_devdistro = "8"
+
+# Yocto release compatibility (REQUIRED, else warning)
+LAYERSERIES_COMPAT_devdistro = "scarthgap"

layers/meta-devdistro/recipes-bsp/u-boot-ti-staging/files/am62x_beagleplay_a53_custom_defconfig

@@ -0,0 +1,134 @@
+CONFIG_ARM=y
+CONFIG_ARCH_K3=y
+CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_SPL_GPIO=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_SOC_K3_AM625=y
+CONFIG_TARGET_AM625_A53_BEAGLEPLAY=y
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80b80000
+CONFIG_DM_GPIO=y
+CONFIG_DEFAULT_DEVICE_TREE="ti/k3-am625-beagleplay"
+CONFIG_SPL_TEXT_BASE=0x80080000
+CONFIG_OF_LIBFDT_OVERLAY=y
+CONFIG_DM_RESET=y
+CONFIG_SPL_MMC=y
+CONFIG_SPL_SERIAL=y
+CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
+CONFIG_SPL_BSS_START_ADDR=0x80c80000
+CONFIG_SPL_BSS_MAX_SIZE=0x80000
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_SIZE_LIMIT=0x40000
+CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x800
+CONFIG_SPL_FS_FAT=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+# CONFIG_PSCI_RESET is not set
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_SPL_LOAD_FIT_ADDRESS=0x81000000
+CONFIG_BOOTSTD_FULL=y
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
+CONFIG_AUTOBOOT_DELAY_STR="d"
+CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_BOOTCOMMAND="run set_led_state_start_load; setenv optargs '${optargs} quiet systemd.show_status=true'; env set name_overlays overlays/am62x_enable_m4f.dtbo; run bootcmd_ti_mmc; run set_led_state_fail_load"
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_SPL_MAX_SIZE=0x58000
+CONFIG_SPL_SYS_REPORT_STACK_F_USAGE=y
+CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_SYS_MMCSD_RAW_MODE=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_FS_LOAD_PAYLOAD_NAME="u-boot.img"
+CONFIG_SPL_I2C=y
+CONFIG_SPL_DM_MAILBOX=y
+CONFIG_SPL_POWER_DOMAIN=y
+CONFIG_SPL_YMODEM_SUPPORT=y
+CONFIG_CMD_BOOTEFI_SELFTEST=y
+CONFIG_CMD_NVEDIT_EFI=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPIO_READ=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_EFIDEBUG=y
+CONFIG_CMD_PMIC=y
+CONFIG_CMD_REGULATOR=y
+CONFIG_OF_CONTROL=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_UPSTREAM=y
+CONFIG_MULTI_DTB_FIT=y
+CONFIG_SPL_MULTI_DTB_FIT=y
+CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SPL_DM=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SPL_SYSCON=y
+CONFIG_SYSCON=y
+CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_CLK_TI_SCI=y
+CONFIG_DFU_MMC=y
+CONFIG_SYS_DFU_DATA_BUF_SIZE=0x40000
+CONFIG_SYS_DFU_MAX_FILE_SIZE=0x180000
+CONFIG_DMA_CHANNELS=y
+CONFIG_TI_K3_NAVSS_UDMA=y
+CONFIG_TI_SCI_PROTOCOL=y
+CONFIG_DA8XX_GPIO=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_OMAP24XX=y
+CONFIG_LED=y
+CONFIG_SPL_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_SPL_LED_GPIO=y
+CONFIG_DM_MAILBOX=y
+CONFIG_K3_SEC_PROXY=y
+CONFIG_MMC_IO_VOLTAGE=y
+CONFIG_MMC_UHS_SUPPORT=y
+CONFIG_MMC_HS200_SUPPORT=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ADMA=y
+CONFIG_SPL_MMC_SDHCI_ADMA=y
+CONFIG_MMC_SDHCI_AM654=y
+CONFIG_PHY_REALTEK=y
+CONFIG_PHY_TI=y
+CONFIG_DM_ETH_PHY=y
+CONFIG_TI_AM65_CPSW_NUSS=y
+CONFIG_PHY=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_TI_SCI_POWER_DOMAIN=y
+CONFIG_DM_PMIC=y
+CONFIG_PMIC_TPS65219=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_DM_REGULATOR_TPS65219=y
+CONFIG_K3_SYSTEM_CONTROLLER=y
+CONFIG_REMOTEPROC_TI_K3_ARM64=y
+CONFIG_RESET_TI_SCI=y
+CONFIG_DM_RTC=y
+CONFIG_RTC_EMULATION=y
+CONFIG_DM_SERIAL=y
+CONFIG_SOC_DEVICE=y
+CONFIG_SOC_DEVICE_TI_K3=y
+CONFIG_SOC_TI=y
+CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
+CONFIG_SYSRESET_TI_SCI=y
+CONFIG_EXT4_WRITE=y
+CONFIG_FS_FAT_MAX_CLUSTSIZE=16384
+CONFIG_LZO=y
+CONFIG_SYS_MALLOC_LEN=0x2000000
+CONFIG_EFI_SET_TIME=y
+
+#include <configs/k3_efi_capsule.config>
+#include <configs/am62x_a53_usbdfu.config>

layers/meta-devdistro/recipes-bsp/u-boot-ti-staging/u-boot-ti-staging_%.bbappend

@@ -0,0 +1,9 @@
+# u-boot-ti-staging_%.bbappend
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://am62x_beagleplay_a53_custom_defconfig"
+
+do_configure:prepend() {
+    install -m 0644 ${WORKDIR}/am62x_beagleplay_a53_custom_defconfig \
+        ${S}/configs/am62x_beagleplay_a53_custom_defconfig
+}

layers/meta-devdistro/recipes-core/images/dev-image-dev.bb

@@ -0,0 +1,19 @@
+DESCRIPTION = "Full headless image"
+
+require dev-image-full.bb
+
+IMAGE_INSTALL += "\
+    dtc \
+    bmaptool \
+    dosfstools \
+    e2fsprogs \
+    e2fsprogs-resize2fs \
+    e2fsprogs-tune2fs \
+    gptfdisk \
+    mmc-utils \
+    mtools \
+    parted \
+    python3-pip \
+    util-linux \
+    xz \
+"

layers/meta-devdistro/recipes-core/images/dev-image-full.bb

@@ -0,0 +1,18 @@
+DESCRIPTION = "Full headless development image"
+
+require dev-image-net.bb
+
+IMAGE_FEATURES += "\
+    ssh-server-dropbear \
+"
+
+IMAGE_INSTALL += "\
+    kernel-modules \
+    \
+    btop \
+    ca-certificates \
+    curl \
+    htop \
+    python3 \
+    vim \
+"

layers/meta-devdistro/recipes-core/images/dev-image-minimal.bb

@@ -0,0 +1,8 @@
+DESCRIPTION = "Minimal headless image"
+LICENSE = "MIT"
+
+inherit core-image
+
+IMAGE_INSTALL = "\
+    packagegroup-core-boot \
+"

layers/meta-devdistro/recipes-core/images/dev-image-net.bb

@@ -0,0 +1,12 @@
+DESCRIPTION = "Minimal image with networking"
+
+require dev-image-minimal.bb
+
+IMAGE_INSTALL += "\
+    ethtool \
+    iproute2 \
+    ssh \
+"
+
+SYSTEMD_AUTO_ENABLE += "systemd-networkd systemd-resolved systemd-sshd"
+IMAGE_INSTALL:remove = "dropbear packagegroup-core-ssh-dropbear"

layers/meta-devdistro/recipes-kernel/linux/files/am62x_enable_m4f.dts

@@ -0,0 +1,48 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+    compatible = "ti,am625-beagleplay", "ti,am625";
+    
+    fragment@0 {
+        target-path = "/";
+        __overlay__ {
+            reserved-memory {
+                #address-cells = <2>;
+                #size-cells = <2>;
+
+                mcu_m4fss_dma_memory_region: m4f-dma-memory@9cb00000 {
+                    compatible = "shared-dma-pool";
+                    reg = <0x00 0x9cb00000 0x00 0x00100000>;
+                    no-map;
+                };
+
+                mcu_m4fss_memory_region: m4f-memory@9cc00000 {
+                    compatible = "shared-dma-pool";
+                    reg = <0x00 0x9cc00000 0x00 0x00e00000>;
+                    no-map;
+                };
+            };
+        };
+    };
+
+    fragment@1 {
+        target = <&mailbox0_cluster0>;
+        __overlay__ {
+            mbox_m4_0: mbox-m4-0 {
+                ti,mbox-rx = <0 0 0>;
+                ti,mbox-tx = <1 0 0>;
+            };
+        };
+    };
+
+    fragment@2 {
+        target = <&mcu_m4fss>;
+        __overlay__ {
+            mboxes = <&mailbox0_cluster0 &mbox_m4_0>;
+	        memory-region = <&mcu_m4fss_dma_memory_region>,
+			                <&mcu_m4fss_memory_region>;
+            status = "okay";
+        };
+    };
+};

layers/meta-devdistro/recipes-kernel/linux/linux-bb.org_%.bbappend

@@ -0,0 +1,14 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://am62x_enable_m4f.dts"
+
+do_compile:prepend() {
+    mkdir -p ${B}/arch/${ARCH}/boot/dts/overlays
+
+    ${STAGING_BINDIR_NATIVE}/dtc -@ -I dts -O dtb -o ${B}/arch/${ARCH}/boot/dts/overlays/am62x_enable_m4f.dtbo ${WORKDIR}/am62x_enable_m4f.dts
+}
+
+do_deploy:append() {
+    install -d ${DEPLOYDIR}/overlays
+    install -m 0644 ${B}/arch/${ARCH}/boot/dts/overlays/am62x_enable_m4f.dtbo ${DEPLOYDIR}/overlays/
+}