* [PATCH 1/3] keystone: machine config: change machine config name from keystone-evm to k2hk-evm
@ 2014-05-16 19:22 hzhang
2014-05-16 19:33 ` Denys Dmytriyenko
0 siblings, 1 reply; 7+ messages in thread
From: hzhang @ 2014-05-16 19:22 UTC (permalink / raw)
To: meta-ti
From: Hao Zhang <hzhang@ti.com>
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 <hzhang@ti.com>
---
conf/machine/{keystone-evm.conf => k2hk-evm.conf} | 0
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, 3 insertions(+), 3 deletions(-)
rename conf/machine/{keystone-evm.conf => k2hk-evm.conf} (100%)
diff --git a/conf/machine/keystone-evm.conf b/conf/machine/k2hk-evm.conf
similarity index 100%
rename from conf/machine/keystone-evm.conf
rename to conf/machine/k2hk-evm.conf
diff --git a/recipes-bsp/boot-monitor/boot-monitor_git.bb b/recipes-bsp/boot-monitor/boot-monitor_git.bb
index 7c5e9cf..0b559fa 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 = "k2hk-evm"
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] keystone: machine config: change machine config name from keystone-evm to k2hk-evm
2014-05-16 19:22 [PATCH 1/3] keystone: machine config: change machine config name from keystone-evm to k2hk-evm hzhang
@ 2014-05-16 19:33 ` Denys Dmytriyenko
2014-05-16 19:40 ` Hao Zhang
0 siblings, 1 reply; 7+ messages in thread
From: Denys Dmytriyenko @ 2014-05-16 19:33 UTC (permalink / raw)
To: hzhang; +Cc: meta-ti
On Fri, May 16, 2014 at 03:22:15PM -0400, hzhang@ti.com wrote:
> From: Hao Zhang <hzhang@ti.com>
>
> 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.
It's better. But I don't see you adding other machines to the kernel recipe.
Is it correct?
> Signed-off-by: Hao Zhang <hzhang@ti.com>
> ---
> conf/machine/{keystone-evm.conf => k2hk-evm.conf} | 0
> 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, 3 insertions(+), 3 deletions(-)
> rename conf/machine/{keystone-evm.conf => k2hk-evm.conf} (100%)
>
> diff --git a/conf/machine/keystone-evm.conf b/conf/machine/k2hk-evm.conf
> similarity index 100%
> rename from conf/machine/keystone-evm.conf
> rename to conf/machine/k2hk-evm.conf
> diff --git a/recipes-bsp/boot-monitor/boot-monitor_git.bb b/recipes-bsp/boot-monitor/boot-monitor_git.bb
> index 7c5e9cf..0b559fa 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 = "k2hk-evm"
>
> 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
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] keystone: machine config: change machine config name from keystone-evm to k2hk-evm
2014-05-16 19:33 ` Denys Dmytriyenko
@ 2014-05-16 19:40 ` Hao Zhang
2014-05-16 19:56 ` Denys Dmytriyenko
0 siblings, 1 reply; 7+ messages in thread
From: Hao Zhang @ 2014-05-16 19:40 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti
On 5/16/2014 3:33 PM, Denys Dmytriyenko wrote:
> On Fri, May 16, 2014 at 03:22:15PM -0400, hzhang@ti.com wrote:
>> From: Hao Zhang <hzhang@ti.com>
>>
>> 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.
>
> It's better. But I don't see you adding other machines to the kernel recipe.
> Is it correct?
>
>
We have not pushed the Linux k2l/K2e changes to external git yet,
internally we will add below append to meta-mcsdk:
KERNEL_DEVICETREE_k2l-evm = "k2l-evm.dtb"
KERNEL_DEVICETREE_k2e-evm = "k2e-evm.dtb"
>> Signed-off-by: Hao Zhang <hzhang@ti.com>
>> ---
>> conf/machine/{keystone-evm.conf => k2hk-evm.conf} | 0
>> 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, 3 insertions(+), 3 deletions(-)
>> rename conf/machine/{keystone-evm.conf => k2hk-evm.conf} (100%)
>>
>> diff --git a/conf/machine/keystone-evm.conf b/conf/machine/k2hk-evm.conf
>> similarity index 100%
>> rename from conf/machine/keystone-evm.conf
>> rename to conf/machine/k2hk-evm.conf
>> diff --git a/recipes-bsp/boot-monitor/boot-monitor_git.bb b/recipes-bsp/boot-monitor/boot-monitor_git.bb
>> index 7c5e9cf..0b559fa 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 = "k2hk-evm"
>>
>> 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
>> meta-ti@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] keystone: machine config: change machine config name from keystone-evm to k2hk-evm
2014-05-16 19:40 ` Hao Zhang
@ 2014-05-16 19:56 ` Denys Dmytriyenko
2014-05-16 19:58 ` Hao Zhang
0 siblings, 1 reply; 7+ messages in thread
From: Denys Dmytriyenko @ 2014-05-16 19:56 UTC (permalink / raw)
To: Hao Zhang; +Cc: meta-ti
On Fri, May 16, 2014 at 03:40:47PM -0400, Hao Zhang wrote:
> On 5/16/2014 3:33 PM, Denys Dmytriyenko wrote:
> > On Fri, May 16, 2014 at 03:22:15PM -0400, hzhang@ti.com wrote:
> >> From: Hao Zhang <hzhang@ti.com>
> >>
> >> 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.
> >
> > It's better. But I don't see you adding other machines to the kernel recipe.
> > Is it correct?
> >
> >
> We have not pushed the Linux k2l/K2e changes to external git yet,
> internally we will add below append to meta-mcsdk:
> KERNEL_DEVICETREE_k2l-evm = "k2l-evm.dtb"
> KERNEL_DEVICETREE_k2e-evm = "k2e-evm.dtb"
Ok, do you plan on making those changes public? Otherwise nobody will be able
to build those other 2 machines outside of your setup...
> >> Signed-off-by: Hao Zhang <hzhang@ti.com>
> >> ---
> >> conf/machine/{keystone-evm.conf => k2hk-evm.conf} | 0
> >> 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, 3 insertions(+), 3 deletions(-)
> >> rename conf/machine/{keystone-evm.conf => k2hk-evm.conf} (100%)
> >>
> >> diff --git a/conf/machine/keystone-evm.conf b/conf/machine/k2hk-evm.conf
> >> similarity index 100%
> >> rename from conf/machine/keystone-evm.conf
> >> rename to conf/machine/k2hk-evm.conf
> >> diff --git a/recipes-bsp/boot-monitor/boot-monitor_git.bb b/recipes-bsp/boot-monitor/boot-monitor_git.bb
> >> index 7c5e9cf..0b559fa 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 = "k2hk-evm"
> >>
> >> 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
> >> meta-ti@yoctoproject.org
> >> https://lists.yoctoproject.org/listinfo/meta-ti
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] keystone: machine config: change machine config name from keystone-evm to k2hk-evm
2014-05-16 19:56 ` Denys Dmytriyenko
@ 2014-05-16 19:58 ` Hao Zhang
0 siblings, 0 replies; 7+ messages in thread
From: Hao Zhang @ 2014-05-16 19:58 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti
On 5/16/2014 3:56 PM, Denys Dmytriyenko wrote:
> On Fri, May 16, 2014 at 03:40:47PM -0400, Hao Zhang wrote:
>> On 5/16/2014 3:33 PM, Denys Dmytriyenko wrote:
>>> On Fri, May 16, 2014 at 03:22:15PM -0400, hzhang@ti.com wrote:
>>>> From: Hao Zhang <hzhang@ti.com>
>>>>
>>>> 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.
>>>
>>> It's better. But I don't see you adding other machines to the kernel recipe.
>>> Is it correct?
>>>
>>>
>> We have not pushed the Linux k2l/K2e changes to external git yet,
>> internally we will add below append to meta-mcsdk:
>> KERNEL_DEVICETREE_k2l-evm = "k2l-evm.dtb"
>> KERNEL_DEVICETREE_k2e-evm = "k2e-evm.dtb"
>
> Ok, do you plan on making those changes public? Otherwise nobody will be able
> to build those other 2 machines outside of your setup...
>
>
Yes, I do, once we push Linux kernel k2l/k2e changes to external git, we
will submit another patch to support k2l/k2e dtb build.
>>>> Signed-off-by: Hao Zhang <hzhang@ti.com>
>>>> ---
>>>> conf/machine/{keystone-evm.conf => k2hk-evm.conf} | 0
>>>> 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, 3 insertions(+), 3 deletions(-)
>>>> rename conf/machine/{keystone-evm.conf => k2hk-evm.conf} (100%)
>>>>
>>>> diff --git a/conf/machine/keystone-evm.conf b/conf/machine/k2hk-evm.conf
>>>> similarity index 100%
>>>> rename from conf/machine/keystone-evm.conf
>>>> rename to conf/machine/k2hk-evm.conf
>>>> diff --git a/recipes-bsp/boot-monitor/boot-monitor_git.bb b/recipes-bsp/boot-monitor/boot-monitor_git.bb
>>>> index 7c5e9cf..0b559fa 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 = "k2hk-evm"
>>>>
>>>> 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
>>>> meta-ti@yoctoproject.org
>>>> https://lists.yoctoproject.org/listinfo/meta-ti
>>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/3] keystone: machine config: change machine config name from keystone-evm to k2hk-evm
@ 2014-05-16 19:13 hzhang
2014-05-16 19:19 ` Denys Dmytriyenko
0 siblings, 1 reply; 7+ messages in thread
From: hzhang @ 2014-05-16 19:13 UTC (permalink / raw)
To: meta-ti
From: Hao Zhang <hzhang@ti.com>
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 <hzhang@ti.com>
---
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 0000000..088e524
--- /dev/null
+++ b/conf/machine/k2hk-evm.conf
@@ -0,0 +1,26 @@
+#@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/conf/machine/keystone-evm.conf b/conf/machine/keystone-evm.conf
deleted file mode 100644
index 088e524..0000000
--- 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 7c5e9cf..0b559fa 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 = "k2hk-evm"
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] keystone: machine config: change machine config name from keystone-evm to k2hk-evm
2014-05-16 19:13 hzhang
@ 2014-05-16 19:19 ` Denys Dmytriyenko
0 siblings, 0 replies; 7+ messages in thread
From: Denys Dmytriyenko @ 2014-05-16 19:19 UTC (permalink / raw)
To: hzhang; +Cc: meta-ti
On Fri, May 16, 2014 at 03:13:53PM -0400, hzhang@ti.com wrote:
> From: Hao Zhang <hzhang@ti.com>
Please pass -M and/or --find-copies-harder when calling format-patch.
> 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 <hzhang@ti.com>
> ---
> 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 0000000..088e524
> --- /dev/null
> +++ b/conf/machine/k2hk-evm.conf
> @@ -0,0 +1,26 @@
> +#@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/conf/machine/keystone-evm.conf b/conf/machine/keystone-evm.conf
> deleted file mode 100644
> index 088e524..0000000
> --- 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 7c5e9cf..0b559fa 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 = "k2hk-evm"
>
> 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
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-05-16 19:58 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-16 19:22 [PATCH 1/3] keystone: machine config: change machine config name from keystone-evm to k2hk-evm hzhang
2014-05-16 19:33 ` Denys Dmytriyenko
2014-05-16 19:40 ` Hao Zhang
2014-05-16 19:56 ` Denys Dmytriyenko
2014-05-16 19:58 ` Hao Zhang
-- strict thread matches above, loose matches on Subject: below --
2014-05-16 19:13 hzhang
2014-05-16 19:19 ` Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.