From: Hao Zhang <[email protected]> Keystone II SOC family has multiple devices and EVMs: k2hk, k2l and k2e, each EVM should have a separate machine config, and share the common keystone SOC family.
Signed-off-by: Hao Zhang <[email protected]> --- conf/machine/{keystone-evm.conf => k2hk-evm.conf} | 4 ++-- recipes-bsp/boot-monitor/boot-monitor_git.bb | 2 +- recipes-kernel/linux/linux-keystone-rt_3.10.bb | 2 +- recipes-kernel/linux/linux-keystone_3.10.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename conf/machine/{keystone-evm.conf => k2hk-evm.conf} (86%) diff --git a/conf/machine/keystone-evm.conf b/conf/machine/k2hk-evm.conf similarity index 86% rename from conf/machine/keystone-evm.conf rename to conf/machine/k2hk-evm.conf index 088e524..4b05f40 100644 --- a/conf/machine/keystone-evm.conf +++ b/conf/machine/k2hk-evm.conf @@ -1,6 +1,6 @@ #@TYPE: Machine -#@NAME: Keystone 2 machine -#@DESCRIPTION: Machine configuration for the TI Keystone 2 +#@NAME: Keystone 2 K2HK machine +#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2HK EVM require conf/machine/include/keystone.inc diff --git a/recipes-bsp/boot-monitor/boot-monitor_git.bb b/recipes-bsp/boot-monitor/boot-monitor_git.bb index 7c5e9cf..c3d41f5 100644 --- a/recipes-bsp/boot-monitor/boot-monitor_git.bb +++ b/recipes-bsp/boot-monitor/boot-monitor_git.bb @@ -9,7 +9,7 @@ BOOT_MONITOR_MAKE_TARGET ?= "all" LIC_FILES_CHKSUM = "file://COPYING;md5=25fe219a6febf6e5bb45beda1b2eb315" -COMPATIBLE_MACHINE = "keystone-evm" +COMPATIBLE_MACHINE = "keystone" SRC_URI = "git://git.ti.com/keystone-linux/boot-monitor.git;protocol=git;branch=${BRANCH}" diff --git a/recipes-kernel/linux/linux-keystone-rt_3.10.bb b/recipes-kernel/linux/linux-keystone-rt_3.10.bb index cbd02d6..eb4bbd2 100644 --- a/recipes-kernel/linux/linux-keystone-rt_3.10.bb +++ b/recipes-kernel/linux/linux-keystone-rt_3.10.bb @@ -13,7 +13,7 @@ require recipes-kernel/linux/setup-defconfig.inc MACHINE_KERNEL_PR_append = "c+gitr${SRCPV}" PR = "${MACHINE_KERNEL_PR}" -KERNEL_DEVICETREE_keystone-evm = "k2hk-evm.dtb" +KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" diff --git a/recipes-kernel/linux/linux-keystone_3.10.bb b/recipes-kernel/linux/linux-keystone_3.10.bb index 54cb86a..93b5481 100644 --- a/recipes-kernel/linux/linux-keystone_3.10.bb +++ b/recipes-kernel/linux/linux-keystone_3.10.bb @@ -13,7 +13,7 @@ require recipes-kernel/linux/setup-defconfig.inc MACHINE_KERNEL_PR_append = "c+gitr${SRCPV}" PR = "${MACHINE_KERNEL_PR}" -KERNEL_DEVICETREE_keystone-evm = "k2hk-evm.dtb" +KERNEL_DEVICETREE_k2hk-evm = "k2hk-evm.dtb" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" -- 1.7.9.5 -- _______________________________________________ meta-ti mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-ti
