machines: Adjust to use new location of tune files in oe-core
PATCH 1/1 machines: Adjust to use new location of tune files in oe-core
Signed-off-by Khem Raj <[email protected]>
--- 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(-)
conf/machine/include/davinci.inc +1 -1
@@ -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"
conf/machine/include/k3r5.inc +1 -1
@@ -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
conf/machine/include/keystone.inc +1 -1
@@ -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"
conf/machine/include/omap-a15.inc +1 -1
@@ -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"
conf/machine/include/omap3.inc +1 -1
@@ -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"
conf/machine/include/omap4.inc +1 -1
@@ -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"
conf/machine/include/ti33x.inc +1 -1
@@ -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"
conf/machine/include/ti43x.inc +1 -1
@@ -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
Right, this has been in my pipeline as well, but I got distracted before finishing it up...
Tested-by Denys Dmytriyenko <[email protected]>
This is only for master.
Quoted 119 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- 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(-)conf/machine/include/davinci.inc +1
-1@@ -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"conf/machine/include/k3r5.inc +1
-1@@ -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/READMEconf/machine/include/keystone.inc +1
-1@@ -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"conf/machine/include/omap-a15.inc +1
-1@@ -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"conf/machine/include/omap3.inc +1
-1@@ -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"conf/machine/include/omap4.inc +1
-1@@ -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"conf/machine/include/ti33x.inc +1
-1@@ -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"conf/machine/include/ti43x.inc +1
-2@@ -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
Signature · 4 lines
Regards, Denys Dmytriyenko <[email protected]> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
Yogesh Siraswar
AppliedApplied to master. Thanks.
Quoted 134 lines · Denys Dmytriyenko
Right, this has been in my pipeline as well, but I got distracted before finishing it up...
Tested-by Denys Dmytriyenko <[email protected]>This is only for master.
Quoted 119 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- 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(-)conf/machine/include/davinci.inc +1
-1@@ -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"conf/machine/include/k3r5.inc +1
-1@@ -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/READMEconf/machine/include/keystone.inc +1
-1@@ -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"conf/machine/include/omap-a15.inc +1
-1@@ -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"conf/machine/include/omap3.inc +1
-1@@ -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"conf/machine/include/omap4.inc +1
-1@@ -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"conf/machine/include/ti33x.inc +1
-1@@ -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"conf/machine/include/ti43x.inc +1
-2@@ -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