From: Denys Dmytriyenko <[email protected]> arago-tiny-image > tisdk-tiny-image arago-base-tisdk-image -> tisdk-base-image tisdk-rootfs-image -> tisdk-default-image arago-core-tisdk-bundle -> tisdk-core-bundle
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/classes/tisdk-bundle.bbclass | 2 +- meta-arago-distro/conf/distro/arago.conf | 2 +- meta-arago-distro/conf/distro/include/branding-bleeding.inc | 2 +- .../images/{arago-base-tisdk-image.bb => tisdk-base-image.bb} | 2 +- .../images/{arago-core-tisdk-bundle.bb => tisdk-core-bundle.bb} | 4 ++-- .../images/{arago-core-tisdk-bundle.inc => tisdk-core-bundle.inc} | 2 +- .../images/{tisdk-rootfs-image.bb => tisdk-default-image.bb} | 2 +- .../recipes-core/images/{arago-tiny-image.bb => tisdk-tiny-image.bb} | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename meta-arago-distro/recipes-core/images/{arago-base-tisdk-image.bb => tisdk-base-image.bb} (86%) rename meta-arago-distro/recipes-core/images/{arago-core-tisdk-bundle.bb => tisdk-core-bundle.bb} (85%) rename meta-arago-distro/recipes-core/images/{arago-core-tisdk-bundle.inc => tisdk-core-bundle.inc} (97%) rename meta-arago-distro/recipes-core/images/{tisdk-rootfs-image.bb => tisdk-default-image.bb} (96%) rename meta-arago-distro/recipes-core/images/{arago-tiny-image.bb => tisdk-tiny-image.bb} (86%) diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass index 40a81a2..45de5fc 100644 --- a/meta-arago-distro/classes/tisdk-bundle.bbclass +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass @@ -30,7 +30,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # List of target side images to be built and packaged. By default take # the base image but this can be modified if desired to package # additional images. -TARGET_IMAGES ?= "arago-base-tisdk-image" +TARGET_IMAGES ?= "tisdk-base-image" # path to install the meta-toolchain package in the SDK TISDK_TOOLCHAIN_PATH ?= "linux-devkit" diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index a0dbadb..ee1bb10 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -152,7 +152,7 @@ PACKAGECONFIG_remove_pn-alsa-plugins = "pulseaudio" RDEPENDS_pulseaudio-server_remove = "alsa-plugins-pulseaudio-conf" # Configure RAMFS for jailhouse linux-demo -JH_RAMFS_IMAGE = "arago-tiny-image" +JH_RAMFS_IMAGE = "tisdk-tiny-image" # Enable UI and scripting for perf PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui" diff --git a/meta-arago-distro/conf/distro/include/branding-bleeding.inc b/meta-arago-distro/conf/distro/include/branding-bleeding.inc index f68df6d..28c6247 100644 --- a/meta-arago-distro/conf/distro/include/branding-bleeding.inc +++ b/meta-arago-distro/conf/distro/include/branding-bleeding.inc @@ -15,4 +15,4 @@ SRCREV_pn-optee-os = "${AUTOREV}" SRCREV_pn-arm-trusted-firmware = "${AUTOREV}" # Build and assemble TI-SDK, but don't package it -IMAGE_FSTYPES_pn-arago-core-tisdk-bundle = "" +IMAGE_FSTYPES_pn-tisdk-core-bundle = "" diff --git a/meta-arago-distro/recipes-core/images/arago-base-tisdk-image.bb b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb similarity index 86% rename from meta-arago-distro/recipes-core/images/arago-base-tisdk-image.bb rename to meta-arago-distro/recipes-core/images/tisdk-base-image.bb index ebb1d42..167833a 100644 --- a/meta-arago-distro/recipes-core/images/arago-base-tisdk-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb @@ -13,4 +13,4 @@ IMAGE_INSTALL += "\ ${VIRTUAL-RUNTIME_initramfs} \ " -export IMAGE_BASENAME = "arago-base-tisdk-image" +export IMAGE_BASENAME = "tisdk-base-image" diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.bb b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb similarity index 85% rename from meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.bb rename to meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb index 2fffe1a..64ee906 100644 --- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb @@ -1,4 +1,4 @@ -require arago-core-tisdk-bundle.inc +require tisdk-core-bundle.inc DEPLOY_SPL_NAME_omapl138 = "" DEPLOY_SPL_NAME_k2hk = "" @@ -12,5 +12,5 @@ DEPLOY_IMAGES_NAME_k3 = "bl31.bin bl32.bin sysfw.itb" DEPLOY_IMAGES_NAME_append_am65xx-evm = " ti-sci-firmware-am65x-gp.bin" DEPLOY_IMAGES_NAME_append_j7-evm = " ti-sci-firmware-j721e-gp.bin" -ARAGO_TISDK_IMAGE ?= "arago-core-tisdk-bundle" +ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle" export IMAGE_BASENAME = "${ARAGO_TISDK_IMAGE}" diff --git a/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc similarity index 97% rename from meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc rename to meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc index 016a4ef..1c35829 100644 --- a/meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.inc @@ -32,7 +32,7 @@ DTB_FILTER_am65xx = "am65" DTB_FILTER_j7 = "j721e" # List of target side images to build for the SDK -TARGET_IMAGES = "arago-base-tisdk-image tisdk-rootfs-image" +TARGET_IMAGES = "tisdk-base-image tisdk-default-image" # dra71 lcard requires an initramfs with modules for NFS boot TARGET_IMAGES_append_dra7xx-evm = " netboot-initrd" diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb similarity index 96% rename from meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb rename to meta-arago-distro/recipes-core/images/tisdk-default-image.bb index 9049ada..ce4287a 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb @@ -26,7 +26,7 @@ IMAGE_INSTALL += "\ ti-demos \ " -export IMAGE_BASENAME = "tisdk-rootfs-image" +export IMAGE_BASENAME = "tisdk-default-image" # Disable ubi/ubifs as the filesystem requires more space than is # available on the HW. diff --git a/meta-arago-distro/recipes-core/images/arago-tiny-image.bb b/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb similarity index 86% rename from meta-arago-distro/recipes-core/images/arago-tiny-image.bb rename to meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb index ae3dc83..28da0b6 100644 --- a/meta-arago-distro/recipes-core/images/arago-tiny-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb @@ -13,4 +13,4 @@ IMAGE_INSTALL = " \ ${ARAGO_TINY_IMAGE_EXTRA_INSTALL} \ " -export IMAGE_BASENAME = "arago-tiny-image" +export IMAGE_BASENAME = "tisdk-tiny-image" -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
