summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/am65xx-evm.conf24
-rw-r--r--conf/machine/am65xx-hs-evm.conf23
-rw-r--r--conf/machine/include/am65xx.inc24
3 files changed, 24 insertions, 47 deletions
diff --git a/conf/machine/am65xx-evm.conf b/conf/machine/am65xx-evm.conf
index 0007377c..2f3b92a8 100644
--- a/conf/machine/am65xx-evm.conf
+++ b/conf/machine/am65xx-evm.conf
@@ -6,32 +6,8 @@ require conf/machine/include/am65xx.inc
6 6
7BBMULTICONFIG += "k3r5-sr2" 7BBMULTICONFIG += "k3r5-sr2"
8 8
9MACHINE_FEATURES += "touchscreen"
10
11SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
12SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
13
14KERNEL_DEVICETREE = " \
15 ti/k3-am654-base-board.dtb \
16 ti/k3-am654-base-board-sr1.dtb \
17 ti/k3-am654-gp.dtbo \
18 ti/k3-am654-idk.dtbo \
19 ti/k3-am654-idk-sr1.dtbo \
20 ti/k3-am654-evm-hdmi.dtbo \
21 ti/k3-am654-evm-oldi-lcd1evm.dtbo \
22 ti/k3-am654-evm-tc358876.dtbo \
23 ti/k3-am654-pcie-usb2.dtbo \
24 ti/k3-am654-pcie-usb3.dtbo \
25 ti/k3-am654-base-board-jailhouse.dtbo \
26 ti/k3-am654-evm-prupwm.dtbo \
27"
28
29UBOOT_MACHINE = "am65x_evm_a53_defconfig" 9UBOOT_MACHINE = "am65x_evm_a53_defconfig"
30 10
31OPTEEMACHINE = "k3"
32OPTEEFLAVOR = "am65x"
33OPTEEOUTPUTMACHINE = "k3"
34
35IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb" 11IMAGE_BOOT_FILES += "sysfw-am65x-evm.itb"
36do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" 12do_image_wic[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
37do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy" 13do_image_tar[mcdepends] += "mc::k3r5-sr2:ti-sci-fw:do_deploy"
diff --git a/conf/machine/am65xx-hs-evm.conf b/conf/machine/am65xx-hs-evm.conf
index 702ba308..e4eebb6a 100644
--- a/conf/machine/am65xx-hs-evm.conf
+++ b/conf/machine/am65xx-hs-evm.conf
@@ -4,27 +4,8 @@
4 4
5require conf/machine/include/am65xx.inc 5require conf/machine/include/am65xx.inc
6 6
7MACHINE_FEATURES += "touchscreen"
8
9SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
10SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
11
12KERNEL_DEVICETREE = " \
13 ti/k3-am654-base-board.dtb ti/k3-am654-gp.dtbo \
14 ti/k3-am654-evm-hdmi.dtbo ti/k3-am654-idk.dtbo \
15 ti/k3-am654-idk-sr1.dtbo \
16 ti/k3-am654-evm-oldi-lcd1evm.dtbo ti/k3-am654-evm-tc358876.dtbo \
17 ti/k3-am654-pcie-usb2.dtbo ti/k3-am654-pcie-usb3.dtbo \
18 ti/k3-am654-base-board-jailhouse.dtbo \
19 ti/k3-am654-evm-prupwm.dtbo \
20"
21
22UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig" 7UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
23 8
24OPTEEMACHINE = "k3"
25OPTEEFLAVOR = "am65x"
26OPTEEOUTPUTMACHINE = "k3"
27
28UBOOT_ENTRYPOINT = "0x80080000" 9UBOOT_ENTRYPOINT = "0x80080000"
29UBOOT_LOADADDRESS = "0x80080000" 10UBOOT_LOADADDRESS = "0x80080000"
30UBOOT_RD_LOADADDRESS = "0x84000000" 11UBOOT_RD_LOADADDRESS = "0x84000000"
@@ -39,7 +20,3 @@ UBOOT_BINARY = "u-boot.img_HS"
39IMAGE_BOOT_FILES = "${UBOOT_BINARY}" 20IMAGE_BOOT_FILES = "${UBOOT_BINARY}"
40 21
41TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}" 22TI_SECURE_DEV_PKG = "${TI_SECURE_DEV_PKG_K3}"
42
43OPTEEMACHINE = "k3"
44OPTEEFLAVOR = "am65x"
45OPTEEOUTPUTMACHINE = "k3"
diff --git a/conf/machine/include/am65xx.inc b/conf/machine/include/am65xx.inc
index d433ed10..f60d1662 100644
--- a/conf/machine/include/am65xx.inc
+++ b/conf/machine/include/am65xx.inc
@@ -1,6 +1,30 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2SOC_FAMILY_append = ":am65xx" 2SOC_FAMILY_append = ":am65xx"
3 3
4MACHINE_FEATURES += "touchscreen"
5
6SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1"
7SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
8
9KERNEL_DEVICETREE = " \
10 ti/k3-am654-base-board.dtb \
11 ti/k3-am654-base-board-sr1.dtb \
12 ti/k3-am654-gp.dtbo \
13 ti/k3-am654-idk.dtbo \
14 ti/k3-am654-idk-sr1.dtbo \
15 ti/k3-am654-evm-hdmi.dtbo \
16 ti/k3-am654-evm-oldi-lcd1evm.dtbo \
17 ti/k3-am654-evm-tc358876.dtbo \
18 ti/k3-am654-pcie-usb2.dtbo \
19 ti/k3-am654-pcie-usb3.dtbo \
20 ti/k3-am654-base-board-jailhouse.dtbo \
21 ti/k3-am654-evm-prupwm.dtbo \
22"
23
24OPTEEMACHINE = "k3"
25OPTEEFLAVOR = "am65x"
26OPTEEOUTPUTMACHINE = "k3"
27
4# Set the list of device targets for ti-pdk class recipes 28# Set the list of device targets for ti-pdk class recipes
5TI_PDK_LIMIT_SOCS = "am65xx" 29TI_PDK_LIMIT_SOCS = "am65xx"
6TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk" 30TI_PDK_LIMIT_BOARDS = "am65xx_evm am65xx_idk"