summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2016-10-25 08:31:47 +0000
committerDenys Dmytriyenko <denys@ti.com>2016-10-25 18:53:25 -0400
commitfd78bce5bad884974db369d8b156ea210ed6006b (patch)
tree95b847628a9a90566bcdc77a54ff9eeb2326cd6d
parenta5ff1c0717ba7c3c53bd72fbf2bcc18cf2798633 (diff)
downloadmeta-ti-fd78bce5bad884974db369d8b156ea210ed6006b.tar.gz
conf/recipes: add k2g-ice machine and k2g SOC family
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--conf/machine/include/k2g.inc2
-rw-r--r--conf/machine/k2g-evm.conf2
-rw-r--r--conf/machine/k2g-ice.conf7
-rw-r--r--recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb2
-rw-r--r--recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb2
-rw-r--r--recipes-bsp/mmap-lld/mmap-lld-test_git.bb6
-rw-r--r--recipes-bsp/pru/pru-icss_git.bb8
-rw-r--r--recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb2
-rw-r--r--recipes-bsp/rm-lld/rm-lld-rtos_git.bb2
-rw-r--r--recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb2
-rw-r--r--recipes-kernel/linux/linux-ti-staging_4.4.bb4
-rw-r--r--recipes-ti/ipc/ti-ipc.inc2
-rw-r--r--recipes-ti/ipc/ti-ipc_git.bb2
-rw-r--r--recipes-ti/openmp-rtos/openmp-rtos_git.bb6
14 files changed, 29 insertions, 20 deletions
diff --git a/conf/machine/include/k2g.inc b/conf/machine/include/k2g.inc
new file mode 100644
index 00000000..3cd540d5
--- /dev/null
+++ b/conf/machine/include/k2g.inc
@@ -0,0 +1,2 @@
1require conf/machine/include/keystone.inc
2SOC_FAMILY_append = ":k2g"
diff --git a/conf/machine/k2g-evm.conf b/conf/machine/k2g-evm.conf
index cc4f2100..fa1edfa9 100644
--- a/conf/machine/k2g-evm.conf
+++ b/conf/machine/k2g-evm.conf
@@ -2,7 +2,7 @@
2#@NAME: Keystone 2 K2G machine 2#@NAME: Keystone 2 K2G machine
3#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G EVM 3#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G EVM
4 4
5require conf/machine/include/keystone.inc 5require conf/machine/include/k2g.inc
6 6
7MACHINE_FEATURES += "alsa opencl" 7MACHINE_FEATURES += "alsa opencl"
8 8
diff --git a/conf/machine/k2g-ice.conf b/conf/machine/k2g-ice.conf
new file mode 100644
index 00000000..6998b3f8
--- /dev/null
+++ b/conf/machine/k2g-ice.conf
@@ -0,0 +1,7 @@
1#@TYPE: Machine
2#@NAME: Keystone 2 K2G ICE machine
3#@DESCRIPTION: Machine configuration for the TI Keystone 2 K2G ICE
4
5require conf/machine/k2g-evm.conf
6
7UBOOT_MACHINE = "k2g_ice_config"
diff --git a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
index 45a047d4..8c5f73da 100644
--- a/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
+++ b/recipes-bsp/common-csl-ip/common-csl-ip-rtos_git.bb
@@ -16,7 +16,7 @@ LIMSOCS_omap-a15 = "am571x am572x"
16LIMSOCS_k2hk-evm = "k2h k2k" 16LIMSOCS_k2hk-evm = "k2h k2k"
17LIMSOCS_k2l-evm = "k2l" 17LIMSOCS_k2l-evm = "k2l"
18LIMSOCS_k2e = "k2e" 18LIMSOCS_k2e = "k2e"
19LIMSOCS_k2g-evm = "k2g" 19LIMSOCS_k2g = "k2g"
20 20
21export PDK_CSL_ROOT_PATH ="${WORKDIR}/build" 21export PDK_CSL_ROOT_PATH ="${WORKDIR}/build"
22export DEST_ROOT="${S}" 22export DEST_ROOT="${S}"
diff --git a/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb b/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb
index 9766b42b..115e9ae0 100644
--- a/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb
+++ b/recipes-bsp/cppi-lld/cppi-lld-rtos_git.bb
@@ -10,4 +10,4 @@ DEPENDS_append = " rm-lld-rtos \
10XDCARGS_k2hk-evm = "k2h k2k" 10XDCARGS_k2hk-evm = "k2h k2k"
11XDCARGS_k2e = "k2e" 11XDCARGS_k2e = "k2e"
12XDCARGS_k2l-evm = "k2l" 12XDCARGS_k2l-evm = "k2l"
13XDCARGS_k2g-evm = "k2g" 13XDCARGS_k2g = "k2g"
diff --git a/recipes-bsp/mmap-lld/mmap-lld-test_git.bb b/recipes-bsp/mmap-lld/mmap-lld-test_git.bb
index f4a6c5de..0540d172 100644
--- a/recipes-bsp/mmap-lld/mmap-lld-test_git.bb
+++ b/recipes-bsp/mmap-lld/mmap-lld-test_git.bb
@@ -9,9 +9,9 @@ DEPENDS="common-csl-ip mmap-lld"
9RDEPENDS_${PN}="uio-module-drv" 9RDEPENDS_${PN}="uio-module-drv"
10 10
11DEVICELIST_k2hk-evm = "k2h k2k" 11DEVICELIST_k2hk-evm = "k2h k2k"
12DEVICELIST_k2e = "k2e" 12DEVICELIST_k2e = "k2e"
13DEVICELIST_k2l-evm = "k2l" 13DEVICELIST_k2l-evm = "k2l"
14DEVICELIST_k2g-evm = "k2g" 14DEVICELIST_k2g = "k2g"
15 15
16CHOICELIST = " yes \ 16CHOICELIST = " yes \
17 no \ 17 no \
diff --git a/recipes-bsp/pru/pru-icss_git.bb b/recipes-bsp/pru/pru-icss_git.bb
index 144e3383..1fbfd126 100644
--- a/recipes-bsp/pru/pru-icss_git.bb
+++ b/recipes-bsp/pru/pru-icss_git.bb
@@ -15,7 +15,7 @@ PR = "r1"
15 15
16require recipes-ti/includes/ti-paths.inc 16require recipes-ti/includes/ti-paths.inc
17 17
18COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g-evm" 18COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|k2g"
19PACKAGE_ARCH = "${MACHINE_ARCH}" 19PACKAGE_ARCH = "${MACHINE_ARCH}"
20 20
21PACKAGES_prepend = " \ 21PACKAGES_prepend = " \
@@ -39,7 +39,7 @@ SUBDIRS = "examples pru_cape/pru_fw lib/src labs"
39PLATFORM_ti33x = "am335x" 39PLATFORM_ti33x = "am335x"
40PLATFORM_ti43x = "am437x" 40PLATFORM_ti43x = "am437x"
41PLATFORM_omap-a15 = "am572x" 41PLATFORM_omap-a15 = "am572x"
42PLATFORM_k2g-evm = "k2g" 42PLATFORM_k2g = "k2g"
43 43
44do_compile() { 44do_compile() {
45 for dir in ${SUBDIRS} 45 for dir in ${SUBDIRS}
@@ -84,7 +84,7 @@ do_install_append_omap-a15() {
84 done 84 done
85} 85}
86 86
87do_install_append_k2g-evm() { 87do_install_append_k2g() {
88 for i in 0 1 88 for i in 0 1
89 do 89 do
90 for j in 0 1 90 for j in 0 1
@@ -102,7 +102,7 @@ FILES_${PN}-rpmsg-echo = "/lib/firmware/pru/PRU_RPMsg_Echo_Interrupt*"
102PRU_ICSS_ALTERNATIVES_ti33x = "am335x-pru0-fw am335x-pru1-fw" 102PRU_ICSS_ALTERNATIVES_ti33x = "am335x-pru0-fw am335x-pru1-fw"
103PRU_ICSS_ALTERNATIVES_ti43x = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_0-fw am437x-pru1_1-fw" 103PRU_ICSS_ALTERNATIVES_ti43x = "am437x-pru0_0-fw am437x-pru0_1-fw am437x-pru1_0-fw am437x-pru1_1-fw"
104PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw" 104PRU_ICSS_ALTERNATIVES_omap-a15 = "am57xx-pru1_0-fw am57xx-pru1_1-fw am57xx-pru2_0-fw am57xx-pru2_1-fw"
105PRU_ICSS_ALTERNATIVES_k2g-evm = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw" 105PRU_ICSS_ALTERNATIVES_k2g = "k2g-pru0_0-fw k2g-pru0_1-fw k2g-pru1_0-fw k2g-pru1_1-fw"
106 106
107# Set up link names for the firmwares 107# Set up link names for the firmwares
108ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw" 108ALTERNATIVE_LINK_NAME[am335x-pru0-fw] = "/lib/firmware/am335x-pru0-fw"
diff --git a/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb b/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb
index 43fd803d..de74d0bc 100644
--- a/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb
+++ b/recipes-bsp/qmss-lld/qmss-lld-rtos_git.bb
@@ -9,4 +9,4 @@ DEPENDS_append = " rm-lld-rtos"
9XDCARGS_k2hk-evm = "k2h k2k" 9XDCARGS_k2hk-evm = "k2h k2k"
10XDCARGS_k2l-evm = "k2l" 10XDCARGS_k2l-evm = "k2l"
11XDCARGS_k2e = "k2e" 11XDCARGS_k2e = "k2e"
12XDCARGS_k2g-evm = "k2g" 12XDCARGS_k2g = "k2g"
diff --git a/recipes-bsp/rm-lld/rm-lld-rtos_git.bb b/recipes-bsp/rm-lld/rm-lld-rtos_git.bb
index 0bf24e27..50de457e 100644
--- a/recipes-bsp/rm-lld/rm-lld-rtos_git.bb
+++ b/recipes-bsp/rm-lld/rm-lld-rtos_git.bb
@@ -9,4 +9,4 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
9XDCARGS_k2hk-evm = "k2h k2k" 9XDCARGS_k2hk-evm = "k2h k2k"
10XDCARGS_k2e = "k2e" 10XDCARGS_k2e = "k2e"
11XDCARGS_k2l-evm = "k2l" 11XDCARGS_k2l-evm = "k2l"
12XDCARGS_k2g-evm = "k2g" 12XDCARGS_k2g = "k2g"
diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 70c96984..eed61d55 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -8,7 +8,7 @@ PR = "r0"
8 8
9CLEANBROKEN = "1" 9CLEANBROKEN = "1"
10 10
11COMPATIBLE_MACHINE = "k2g-evm" 11COMPATIBLE_MACHINE = "k2g"
12 12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 13PACKAGE_ARCH = "${MACHINE_ARCH}"
14 14
diff --git a/recipes-kernel/linux/linux-ti-staging_4.4.bb b/recipes-kernel/linux/linux-ti-staging_4.4.bb
index 708ce85f..1b4676af 100644
--- a/recipes-kernel/linux/linux-ti-staging_4.4.bb
+++ b/recipes-kernel/linux/linux-ti-staging_4.4.bb
@@ -29,7 +29,7 @@ RDEPENDS_kernel-base_append_dra7xx = " vpdma-fw"
29RDEPENDS_kernel-base_append_keystone = " boot-monitor" 29RDEPENDS_kernel-base_append_keystone = " boot-monitor"
30 30
31# Install ti-sci-fw into /boot dir of rootfs 31# Install ti-sci-fw into /boot dir of rootfs
32RDEPENDS_kernel-base_append_k2g-evm = " ti-sci-fw" 32RDEPENDS_kernel-base_append_k2g = " ti-sci-fw"
33 33
34# Add run-time dependency for SerDes firmware to the rootfs 34# Add run-time dependency for SerDes firmware to the rootfs
35RDEPENDS_kernel-base_append_keystone = " serdes-fw" 35RDEPENDS_kernel-base_append_keystone = " serdes-fw"
@@ -67,7 +67,7 @@ KERNEL_DEVICETREE_beagleboard = "omap3-beagle.dtb omap3-beagle-xm.dtb omap3-beag
67KERNEL_DEVICETREE_pandaboard = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb" 67KERNEL_DEVICETREE_pandaboard = "omap4-panda.dtb omap4-panda-a4.dtb omap4-panda-es.dtb"
68KERNEL_DEVICETREE_k2hk-evm = "keystone-k2hk-evm.dtb" 68KERNEL_DEVICETREE_k2hk-evm = "keystone-k2hk-evm.dtb"
69KERNEL_DEVICETREE_k2e = "keystone-k2e-evm.dtb" 69KERNEL_DEVICETREE_k2e = "keystone-k2e-evm.dtb"
70KERNEL_DEVICETREE_k2g-evm = "keystone-k2g-evm.dtb" 70KERNEL_DEVICETREE_k2g = "keystone-k2g-evm.dtb"
71KERNEL_DEVICETREE_k2l-evm = "keystone-k2l-evm.dtb" 71KERNEL_DEVICETREE_k2l-evm = "keystone-k2l-evm.dtb"
72 72
73COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap3|omap4|keystone" 73COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap3|omap4|keystone"
diff --git a/recipes-ti/ipc/ti-ipc.inc b/recipes-ti/ipc/ti-ipc.inc
index c6c09656..3ce02c4e 100644
--- a/recipes-ti/ipc/ti-ipc.inc
+++ b/recipes-ti/ipc/ti-ipc.inc
@@ -27,6 +27,6 @@ PLATFORM_dra7xx = "DRA7XX"
27PLATFORM_k2hk-evm = "TCI6638" 27PLATFORM_k2hk-evm = "TCI6638"
28PLATFORM_k2l-evm = "TCI6630" 28PLATFORM_k2l-evm = "TCI6630"
29PLATFORM_k2e = "66AK2E" 29PLATFORM_k2e = "66AK2E"
30PLATFORM_k2g-evm = "66AK2G" 30PLATFORM_k2g = "66AK2G"
31 31
32ALT_PLATFORM_k2hk-evm = "TCI6636" 32ALT_PLATFORM_k2hk-evm = "TCI6636"
diff --git a/recipes-ti/ipc/ti-ipc_git.bb b/recipes-ti/ipc/ti-ipc_git.bb
index 4cbc022f..cd844b43 100644
--- a/recipes-ti/ipc/ti-ipc_git.bb
+++ b/recipes-ti/ipc/ti-ipc_git.bb
@@ -17,7 +17,7 @@ DAEMON_dra7xx = "lad_dra7xx"
17DAEMON_k2hk-evm = "lad_tci6638" 17DAEMON_k2hk-evm = "lad_tci6638"
18DAEMON_k2l-evm = "lad_tci6630" 18DAEMON_k2l-evm = "lad_tci6630"
19DAEMON_k2e = "lad_66ak2e" 19DAEMON_k2e = "lad_66ak2e"
20DAEMON_k2g-evm = "lad_66ak2g" 20DAEMON_k2g = "lad_66ak2g"
21 21
22inherit autotools-brokensep pkgconfig update-rc.d 22inherit autotools-brokensep pkgconfig update-rc.d
23 23
diff --git a/recipes-ti/openmp-rtos/openmp-rtos_git.bb b/recipes-ti/openmp-rtos/openmp-rtos_git.bb
index ace73199..104ccde1 100644
--- a/recipes-ti/openmp-rtos/openmp-rtos_git.bb
+++ b/recipes-ti/openmp-rtos/openmp-rtos_git.bb
@@ -43,13 +43,13 @@ export BUILD_K2G = "0"
43 43
44BUILD_K2H_keystone = "1" 44BUILD_K2H_keystone = "1"
45BUILD_AM572_omap-a15 = "1" 45BUILD_AM572_omap-a15 = "1"
46BUILD_K2H_k2g-evm = "0" 46BUILD_K2H_k2g = "0"
47BUILD_K2G_k2g-evm = "1" 47BUILD_K2G_k2g = "1"
48 48
49RELEASE_TARGET = "" 49RELEASE_TARGET = ""
50RELEASE_TARGET_keystone = "k2x" 50RELEASE_TARGET_keystone = "k2x"
51RELEASE_TARGET_omap-a15 = "am57xx" 51RELEASE_TARGET_omap-a15 = "am57xx"
52RELEASE_TARGET_k2g-evm = "k2g" 52RELEASE_TARGET_k2g = "k2g"
53 53
54do_compile() { 54do_compile() {
55 make -f utils/product/Makefile .zipfile 55 make -f utils/product/Makefile .zipfile