am62xx-evm-k3r5: Centralize the k3r5 settings

Since we are going to be effectively duplicating most of the what k3r5
does for the k3r5-falcon builds, we need to have the same settings.  But
we cannot just include the am62xx-evm-k3r5.conf as a starting point
since it sets somethings we do not want.

Solution is to pull all of the common settings out into an include files
and just include it in both flows.

This commit just does this for the existing k3r5 build so that the
upcoming k3r5-falcon change can use it.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>

2 files changed, 15 insertions, 15 deletions

diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
index bb713a82..80e369d8 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -3,18 +3,4 @@
 #@DESCRIPTION: Machine configuration for the TI AM62xx EVM (R5F core)
 
 require conf/machine/include/k3r5.inc
-
-UBOOT_TEST_BUILD_CONFIGS ?= "usbdfu"
-UBOOT_TEST_BUILD_CONFIGS:bsp-ti-6_6 = ""
-UBOOT_TEST_BUILD_CONFIGS:bsp-next = ""
-UBOOT_TEST_BUILD_CONFIGS:bsp-mainline = ""
-
-UBOOT_MACHINE = "am62x_evm_r5_defconfig"
-UBOOT_MACHINE:tie-test-builds = ""
-
-UBOOT_CONFIG = ""
-UBOOT_CONFIG:tie-test-builds = "${UBOOT_TEST_BUILD_CONFIGS} main"
-UBOOT_CONFIG[main] = "am62x_evm_r5_defconfig"
-UBOOT_CONFIG[usbdfu] = "am62x_evm_r5_usbdfu_defconfig"
-
-UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"
+require conf/machine/include/am62xx-k3r5.inc
diff --git a/meta-ti-bsp/conf/machine/include/am62xx-k3r5.inc b/meta-ti-bsp/conf/machine/include/am62xx-k3r5.inc
new file mode 100644
index 00000000..900cfad9
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/am62xx-k3r5.inc
@@ -0,0 +1,14 @@
+UBOOT_TEST_BUILD_CONFIGS ?= "usbdfu"
+UBOOT_TEST_BUILD_CONFIGS:bsp-ti-6_6 = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-next = ""
+UBOOT_TEST_BUILD_CONFIGS:bsp-mainline = ""
+
+UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_MACHINE:tie-test-builds = ""
+
+UBOOT_CONFIG = ""
+UBOOT_CONFIG:tie-test-builds = "${UBOOT_TEST_BUILD_CONFIGS} main"
+UBOOT_CONFIG[main] = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG[usbdfu] = "am62x_evm_r5_usbdfu_defconfig"
+
+UBOOT_CONFIG_FRAGMENTS:ti-falcon = "k3_r5_falcon.config"