diff options
7 files changed, 17 insertions, 1 deletions
diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf index f7835459..10067159 100644 --- a/meta-ti-bsp/conf/layer.conf +++ b/meta-ti-bsp/conf/layer.conf | |||
@@ -25,6 +25,7 @@ LAYERRECOMMENDS_meta-ti-bsp = " \ | |||
25 | BBFILES_DYNAMIC += " \ | 25 | BBFILES_DYNAMIC += " \ |
26 | meta-arago-distro:${LAYERDIR}/dynamic-layers/meta-arago-distro/recipes*/*/*.bbappend \ | 26 | meta-arago-distro:${LAYERDIR}/dynamic-layers/meta-arago-distro/recipes*/*/*.bbappend \ |
27 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \ | 27 | openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \ |
28 | core:${LAYERDIR}/dynamic-layers/core/recipes*/*/*.bbappend \ | ||
28 | " | 29 | " |
29 | 30 | ||
30 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ | 31 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ |
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index 49e996c8..56b56afe 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc | |||
@@ -34,3 +34,5 @@ TFA_BOARD = "lite" | |||
34 | OPTEEMACHINE = "k3-am64x" | 34 | OPTEEMACHINE = "k3-am64x" |
35 | 35 | ||
36 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw" | 36 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "prueth-fw pruhsr-fw prusw-fw" |
37 | |||
38 | TI_WKS_BOOTLOADER_APPEND="console=ttyS2,115200n8" | ||
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 0e8729df..7860a84c 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc | |||
@@ -50,6 +50,8 @@ MACHINE_FEATURES += "efi" | |||
50 | 50 | ||
51 | WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" | 51 | WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" |
52 | 52 | ||
53 | TI_WKS_BOOTLOADER_APPEND ?= "" | ||
54 | |||
53 | do_image_wic[depends] += "virtual/bootloader:do_deploy" | 55 | do_image_wic[depends] += "virtual/bootloader:do_deploy" |
54 | 56 | ||
55 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" | 57 | SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" |
diff --git a/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-base.bbappend b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-base.bbappend new file mode 100644 index 00000000..b6c70dc5 --- /dev/null +++ b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-base.bbappend | |||
@@ -0,0 +1,4 @@ | |||
1 | IMAGE_POKY = "" | ||
2 | IMAGE_POKY:poky = "image-poky.inc" | ||
3 | |||
4 | require ${IMAGE_POKY} | ||
diff --git a/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-minimal.bbappend b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-minimal.bbappend new file mode 100644 index 00000000..b6c70dc5 --- /dev/null +++ b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/core-image-minimal.bbappend | |||
@@ -0,0 +1,4 @@ | |||
1 | IMAGE_POKY = "" | ||
2 | IMAGE_POKY:poky = "image-poky.inc" | ||
3 | |||
4 | require ${IMAGE_POKY} | ||
diff --git a/meta-ti-bsp/dynamic-layers/core/recipes-core/images/image-poky.inc b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/image-poky.inc new file mode 100644 index 00000000..31c6b6f7 --- /dev/null +++ b/meta-ti-bsp/dynamic-layers/core/recipes-core/images/image-poky.inc | |||
@@ -0,0 +1,3 @@ | |||
1 | include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} | ||
2 | |||
3 | do_image_wic[depends] += "virtual/kernel:do_shared_workdir" | ||
diff --git a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in index ca042be1..ae38daa7 100644 --- a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in +++ b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in | |||
@@ -3,6 +3,6 @@ | |||
3 | # supports EFI. Boot files are located in the first vfat partition with extra | 3 | # supports EFI. Boot files are located in the first vfat partition with extra |
4 | # reserved space. We cannot use a GPT here. | 4 | # reserved space. We cannot use a GPT here. |
5 | 5 | ||
6 | bootloader --timeout=3 --append="rootfstype=ext4" | 6 | bootloader --timeout=3 --append="rootfstype=ext4 ${TI_WKS_BOOTLOADER_APPEND}" |
7 | part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M | 7 | part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M |
8 | part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid | 8 | part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid |