From 4be60cf6cf44ac270bf5a106d63830a03cba1d76 Mon Sep 17 00:00:00 2001 From: Hao Zhang Date: Mon, 19 May 2014 19:51:28 +0000 Subject: keystone: machine config: change machine config name from keystone-evm to k2hk-evm 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 Signed-off-by: Denys Dmytriyenko --- conf/machine/k2hk-evm.conf | 26 ++++++++++++++++++++++++++ conf/machine/keystone-evm.conf | 26 -------------------------- 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 +- 5 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 conf/machine/k2hk-evm.conf delete mode 100644 conf/machine/keystone-evm.conf diff --git a/conf/machine/k2hk-evm.conf b/conf/machine/k2hk-evm.conf new file mode 100644 index 00000000..4b05f402 --- /dev/null +++ b/conf/machine/k2hk-evm.conf @@ -0,0 +1,26 @@ +#@TYPE: Machine +#@NAME: Keystone 2 K2HK machine +#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2HK EVM + +require conf/machine/include/keystone.inc + +IMAGE_FSTYPES += "ubi tar.gz cpio" + +SERIAL_CONSOLE = "115200 ttyS0" + +SYSVINIT_ENABLED_GETTYS = "" + +# do ubiattach /dev/ubi_ctrl -m 4 +# From dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: logical eraseblock size: 126976 bytes +# from ubiattach stdout: +# UBI device number 0, total 3856 LEBs +MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856" + +# do ubiattach /dev/ubi_ctrl -m 4 +# from dmesg: +# UBI: smallest flash I/O unit: 2048 +# UBI: physical eraseblock size: 131072 bytes (128 KiB) +# UBI: sub-page size: 2048 +UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048" diff --git a/conf/machine/keystone-evm.conf b/conf/machine/keystone-evm.conf deleted file mode 100644 index 088e524a..00000000 --- a/conf/machine/keystone-evm.conf +++ /dev/null @@ -1,26 +0,0 @@ -#@TYPE: Machine -#@NAME: Keystone 2 machine -#@DESCRIPTION: Machine configuration for the TI Keystone 2 - -require conf/machine/include/keystone.inc - -IMAGE_FSTYPES += "ubi tar.gz cpio" - -SERIAL_CONSOLE = "115200 ttyS0" - -SYSVINIT_ENABLED_GETTYS = "" - -# do ubiattach /dev/ubi_ctrl -m 4 -# From dmesg: -# UBI: smallest flash I/O unit: 2048 -# UBI: logical eraseblock size: 126976 bytes -# from ubiattach stdout: -# UBI device number 0, total 3856 LEBs -MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3856" - -# do ubiattach /dev/ubi_ctrl -m 4 -# from dmesg: -# UBI: smallest flash I/O unit: 2048 -# UBI: physical eraseblock size: 131072 bytes (128 KiB) -# UBI: sub-page size: 2048 -UBINIZE_ARGS = "-m 2048 -p 128KiB -s 2048 -O 2048" diff --git a/recipes-bsp/boot-monitor/boot-monitor_git.bb b/recipes-bsp/boot-monitor/boot-monitor_git.bb index 7c5e9cf0..c3d41f54 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 cbd02d61..eb4bbd2e 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 54cb86ac..93b5481c 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}" -- cgit v1.2.3-54-g00ecf