All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-ti][PATCH] machines: Adjust to use new location of tune files in oe-core
@ 2021-08-18 18:17 Khem Raj
  2021-08-18 19:19 ` Denys Dmytriyenko
  0 siblings, 1 reply; 3+ messages in thread
From: Khem Raj @ 2021-08-18 18:17 UTC (permalink / raw)
  To: meta-ti; +Cc: Khem Raj

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/machine/include/davinci.inc  | 2 +-
 conf/machine/include/k3r5.inc     | 2 +-
 conf/machine/include/keystone.inc | 2 +-
 conf/machine/include/omap-a15.inc | 2 +-
 conf/machine/include/omap3.inc    | 2 +-
 conf/machine/include/omap4.inc    | 2 +-
 conf/machine/include/ti33x.inc    | 2 +-
 conf/machine/include/ti43x.inc    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index d2681740..b8d207de 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/tune-arm926ejs.inc
+require conf/machine/include/arm/armv5/tune-arm926ejs.inc

 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r54"
diff --git a/conf/machine/include/k3r5.inc b/conf/machine/include/k3r5.inc
index 93f08c04..3cc79061 100644
--- a/conf/machine/include/k3r5.inc
+++ b/conf/machine/include/k3r5.inc
@@ -5,7 +5,7 @@ SOC_FAMILY:append = ":k3r5"

 # The closest of existing tunes for Cortex-R5F
 DEFAULTTUNE = "armv7athf"
-require conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/arm/armv7a/tune-cortexa8.inc

 # R5 runs early bootloader and loads SYSFW
 # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/am65x/README
diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc
index 83dca19d..851328ac 100644
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/keystone.inc
@@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":keystone"

 DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/tune-cortexa15.inc
+require conf/machine/include/arm/armv7a/tune-cortexa15.inc

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
index 553835c8..57295a85 100644
--- a/conf/machine/include/omap-a15.inc
+++ b/conf/machine/include/omap-a15.inc
@@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":omap-a15"

 DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/tune-cortexa15.inc
+require conf/machine/include/arm/armv7a/tune-cortexa15.inc

 # Increase this everytime you change something in the kernel
 MACHINE_KERNEL_PR = "r7"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index ab069b00..6e0d8dbc 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":omap3"

 DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/arm/armv7a/tune-cortexa8.inc

 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"

diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
index b6f43744..b8bd9d37 100644
--- a/conf/machine/include/omap4.inc
+++ b/conf/machine/include/omap4.inc
@@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":omap4"

 DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc

 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
index 3da2aba5..896328d9 100644
--- a/conf/machine/include/ti33x.inc
+++ b/conf/machine/include/ti33x.inc
@@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":ti33x"

 DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/tune-cortexa8.inc
+require conf/machine/include/arm/armv7a/tune-cortexa8.inc

 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"

diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc
index eaed1812..0f28cc91 100644
--- a/conf/machine/include/ti43x.inc
+++ b/conf/machine/include/ti43x.inc
@@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
 SOC_FAMILY:append = ":ti43x"

 DEFAULTTUNE ?= "armv7athf-neon"
-require conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc

 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"

--
2.33.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [meta-ti][PATCH] machines: Adjust to use new location of tune files in oe-core
  2021-08-18 18:17 [meta-ti][PATCH] machines: Adjust to use new location of tune files in oe-core Khem Raj
@ 2021-08-18 19:19 ` Denys Dmytriyenko
  2021-08-19  9:42   ` Yogesh Siraswar
  0 siblings, 1 reply; 3+ messages in thread
From: Denys Dmytriyenko @ 2021-08-18 19:19 UTC (permalink / raw)
  To: Khem Raj; +Cc: meta-ti

Right, this has been in my pipeline as well, but I got distracted before 
finishing it up...

Tested-by: Denys Dmytriyenko <denys@konsulko.com>

This is only for master.


On Wed, Aug 18, 2021 at 11:17:48AM -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  conf/machine/include/davinci.inc  | 2 +-
>  conf/machine/include/k3r5.inc     | 2 +-
>  conf/machine/include/keystone.inc | 2 +-
>  conf/machine/include/omap-a15.inc | 2 +-
>  conf/machine/include/omap3.inc    | 2 +-
>  conf/machine/include/omap4.inc    | 2 +-
>  conf/machine/include/ti33x.inc    | 2 +-
>  conf/machine/include/ti43x.inc    | 2 +-
>  8 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
> index d2681740..b8d207de 100644
> --- a/conf/machine/include/davinci.inc
> +++ b/conf/machine/include/davinci.inc
> @@ -1,4 +1,4 @@
> -require conf/machine/include/tune-arm926ejs.inc
> +require conf/machine/include/arm/armv5/tune-arm926ejs.inc
> 
>  # Increase this everytime you change something in the kernel
>  MACHINE_KERNEL_PR = "r54"
> diff --git a/conf/machine/include/k3r5.inc b/conf/machine/include/k3r5.inc
> index 93f08c04..3cc79061 100644
> --- a/conf/machine/include/k3r5.inc
> +++ b/conf/machine/include/k3r5.inc
> @@ -5,7 +5,7 @@ SOC_FAMILY:append = ":k3r5"
> 
>  # The closest of existing tunes for Cortex-R5F
>  DEFAULTTUNE = "armv7athf"
> -require conf/machine/include/tune-cortexa8.inc
> +require conf/machine/include/arm/armv7a/tune-cortexa8.inc
> 
>  # R5 runs early bootloader and loads SYSFW
>  # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/am65x/README
> diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc
> index 83dca19d..851328ac 100644
> --- a/conf/machine/include/keystone.inc
> +++ b/conf/machine/include/keystone.inc
> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>  SOC_FAMILY:append = ":keystone"
> 
>  DEFAULTTUNE ?= "armv7athf-neon"
> -require conf/machine/include/tune-cortexa15.inc
> +require conf/machine/include/arm/armv7a/tune-cortexa15.inc
> 
>  PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
>  PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
> diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
> index 553835c8..57295a85 100644
> --- a/conf/machine/include/omap-a15.inc
> +++ b/conf/machine/include/omap-a15.inc
> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>  SOC_FAMILY:append = ":omap-a15"
> 
>  DEFAULTTUNE ?= "armv7athf-neon"
> -require conf/machine/include/tune-cortexa15.inc
> +require conf/machine/include/arm/armv7a/tune-cortexa15.inc
> 
>  # Increase this everytime you change something in the kernel
>  MACHINE_KERNEL_PR = "r7"
> diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
> index ab069b00..6e0d8dbc 100644
> --- a/conf/machine/include/omap3.inc
> +++ b/conf/machine/include/omap3.inc
> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>  SOC_FAMILY:append = ":omap3"
> 
>  DEFAULTTUNE ?= "armv7athf-neon"
> -require conf/machine/include/tune-cortexa8.inc
> +require conf/machine/include/arm/armv7a/tune-cortexa8.inc
> 
>  PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
> 
> diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
> index b6f43744..b8bd9d37 100644
> --- a/conf/machine/include/omap4.inc
> +++ b/conf/machine/include/omap4.inc
> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>  SOC_FAMILY:append = ":omap4"
> 
>  DEFAULTTUNE ?= "armv7athf-neon"
> -require conf/machine/include/tune-cortexa9.inc
> +require conf/machine/include/arm/armv7a/tune-cortexa9.inc
> 
>  PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
>  PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
> diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
> index 3da2aba5..896328d9 100644
> --- a/conf/machine/include/ti33x.inc
> +++ b/conf/machine/include/ti33x.inc
> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>  SOC_FAMILY:append = ":ti33x"
> 
>  DEFAULTTUNE ?= "armv7athf-neon"
> -require conf/machine/include/tune-cortexa8.inc
> +require conf/machine/include/arm/armv7a/tune-cortexa8.inc
> 
>  PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
> 
> diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc
> index eaed1812..0f28cc91 100644
> --- a/conf/machine/include/ti43x.inc
> +++ b/conf/machine/include/ti43x.inc
> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>  SOC_FAMILY:append = ":ti43x"
> 
>  DEFAULTTUNE ?= "armv7athf-neon"
> -require conf/machine/include/tune-cortexa9.inc
> +require conf/machine/include/arm/armv7a/tune-cortexa9.inc
> 
>  PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
> 
> --
> 2.33.0

> 
> 
> 


-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [meta-ti][PATCH] machines: Adjust to use new location of tune files in oe-core
  2021-08-18 19:19 ` Denys Dmytriyenko
@ 2021-08-19  9:42   ` Yogesh Siraswar
  0 siblings, 0 replies; 3+ messages in thread
From: Yogesh Siraswar @ 2021-08-19  9:42 UTC (permalink / raw)
  To: Denys Dmytriyenko, Khem Raj; +Cc: meta-ti

Applied to master. Thanks.

On 8/18/2021 2:19 PM, Denys Dmytriyenko wrote:
> Right, this has been in my pipeline as well, but I got distracted before
> finishing it up...
> 
> Tested-by: Denys Dmytriyenko <denys@konsulko.com>
> 
> This is only for master.
> 
> 
> On Wed, Aug 18, 2021 at 11:17:48AM -0700, Khem Raj wrote:
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>   conf/machine/include/davinci.inc  | 2 +-
>>   conf/machine/include/k3r5.inc     | 2 +-
>>   conf/machine/include/keystone.inc | 2 +-
>>   conf/machine/include/omap-a15.inc | 2 +-
>>   conf/machine/include/omap3.inc    | 2 +-
>>   conf/machine/include/omap4.inc    | 2 +-
>>   conf/machine/include/ti33x.inc    | 2 +-
>>   conf/machine/include/ti43x.inc    | 2 +-
>>   8 files changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
>> index d2681740..b8d207de 100644
>> --- a/conf/machine/include/davinci.inc
>> +++ b/conf/machine/include/davinci.inc
>> @@ -1,4 +1,4 @@
>> -require conf/machine/include/tune-arm926ejs.inc
>> +require conf/machine/include/arm/armv5/tune-arm926ejs.inc
>>
>>   # Increase this everytime you change something in the kernel
>>   MACHINE_KERNEL_PR = "r54"
>> diff --git a/conf/machine/include/k3r5.inc b/conf/machine/include/k3r5.inc
>> index 93f08c04..3cc79061 100644
>> --- a/conf/machine/include/k3r5.inc
>> +++ b/conf/machine/include/k3r5.inc
>> @@ -5,7 +5,7 @@ SOC_FAMILY:append = ":k3r5"
>>
>>   # The closest of existing tunes for Cortex-R5F
>>   DEFAULTTUNE = "armv7athf"
>> -require conf/machine/include/tune-cortexa8.inc
>> +require conf/machine/include/arm/armv7a/tune-cortexa8.inc
>>
>>   # R5 runs early bootloader and loads SYSFW
>>   # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/board/ti/am65x/README
>> diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc
>> index 83dca19d..851328ac 100644
>> --- a/conf/machine/include/keystone.inc
>> +++ b/conf/machine/include/keystone.inc
>> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>>   SOC_FAMILY:append = ":keystone"
>>
>>   DEFAULTTUNE ?= "armv7athf-neon"
>> -require conf/machine/include/tune-cortexa15.inc
>> +require conf/machine/include/arm/armv7a/tune-cortexa15.inc
>>
>>   PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
>>   PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
>> diff --git a/conf/machine/include/omap-a15.inc b/conf/machine/include/omap-a15.inc
>> index 553835c8..57295a85 100644
>> --- a/conf/machine/include/omap-a15.inc
>> +++ b/conf/machine/include/omap-a15.inc
>> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>>   SOC_FAMILY:append = ":omap-a15"
>>
>>   DEFAULTTUNE ?= "armv7athf-neon"
>> -require conf/machine/include/tune-cortexa15.inc
>> +require conf/machine/include/arm/armv7a/tune-cortexa15.inc
>>
>>   # Increase this everytime you change something in the kernel
>>   MACHINE_KERNEL_PR = "r7"
>> diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
>> index ab069b00..6e0d8dbc 100644
>> --- a/conf/machine/include/omap3.inc
>> +++ b/conf/machine/include/omap3.inc
>> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>>   SOC_FAMILY:append = ":omap3"
>>
>>   DEFAULTTUNE ?= "armv7athf-neon"
>> -require conf/machine/include/tune-cortexa8.inc
>> +require conf/machine/include/arm/armv7a/tune-cortexa8.inc
>>
>>   PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
>>
>> diff --git a/conf/machine/include/omap4.inc b/conf/machine/include/omap4.inc
>> index b6f43744..b8bd9d37 100644
>> --- a/conf/machine/include/omap4.inc
>> +++ b/conf/machine/include/omap4.inc
>> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>>   SOC_FAMILY:append = ":omap4"
>>
>>   DEFAULTTUNE ?= "armv7athf-neon"
>> -require conf/machine/include/tune-cortexa9.inc
>> +require conf/machine/include/arm/armv7a/tune-cortexa9.inc
>>
>>   PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
>>   PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
>> diff --git a/conf/machine/include/ti33x.inc b/conf/machine/include/ti33x.inc
>> index 3da2aba5..896328d9 100644
>> --- a/conf/machine/include/ti33x.inc
>> +++ b/conf/machine/include/ti33x.inc
>> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>>   SOC_FAMILY:append = ":ti33x"
>>
>>   DEFAULTTUNE ?= "armv7athf-neon"
>> -require conf/machine/include/tune-cortexa8.inc
>> +require conf/machine/include/arm/armv7a/tune-cortexa8.inc
>>
>>   PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
>>
>> diff --git a/conf/machine/include/ti43x.inc b/conf/machine/include/ti43x.inc
>> index eaed1812..0f28cc91 100644
>> --- a/conf/machine/include/ti43x.inc
>> +++ b/conf/machine/include/ti43x.inc
>> @@ -2,7 +2,7 @@ require conf/machine/include/ti-soc.inc
>>   SOC_FAMILY:append = ":ti43x"
>>
>>   DEFAULTTUNE ?= "armv7athf-neon"
>> -require conf/machine/include/tune-cortexa9.inc
>> +require conf/machine/include/arm/armv7a/tune-cortexa9.inc
>>
>>   PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
>>
>> --
>> 2.33.0
> 
>>
>>
>>
> 
> 
> 
> 
> 
> 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-08-19  9:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-18 18:17 [meta-ti][PATCH] machines: Adjust to use new location of tune files in oe-core Khem Raj
2021-08-18 19:19 ` Denys Dmytriyenko
2021-08-19  9:42   ` Yogesh Siraswar

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.