diff options
-rw-r--r-- | common/common_manifest.xml | 4 | ||||
-rw-r--r-- | intel-corei7-64/.README (renamed from zcu102-zynqmp/.README) | 2 | ||||
-rw-r--r-- | intel-corei7-64/README (renamed from zcu102-zynqmp/README) | 4 | ||||
-rw-r--r-- | intel-corei7-64/default.xml (renamed from zcu102-zynqmp/default.xml) | 19 | ||||
-rw-r--r-- | intel-corei7-64/eltf.conf (renamed from zcu102-zynqmp/eltf.conf) | 8 | ||||
-rw-r--r-- | intel-corei7-64/manifest_template.xml | 13 | ||||
-rw-r--r-- | zcu102-zynqmp/manifest_template.xml | 13 |
7 files changed, 33 insertions, 30 deletions
diff --git a/common/common_manifest.xml b/common/common_manifest.xml index eecb392..01d7090 100644 --- a/common/common_manifest.xml +++ b/common/common_manifest.xml | |||
@@ -1,11 +1,11 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <manifest> | 2 | <manifest> |
3 | <!--Common parts of the manifest template for standard profile --> | 3 | <!--Common parts of the manifest template for accelerated profile --> |
4 | 4 | ||
5 | <remote name="git-enea" fetch="ssh://git@git.enea.com/"/> | 5 | <remote name="git-enea" fetch="ssh://git@git.enea.com/"/> |
6 | <remote name="gerrit-enea" fetch="ssh://gerrit.enea.se:29418/"/> | 6 | <remote name="gerrit-enea" fetch="ssh://gerrit.enea.se:29418/"/> |
7 | 7 | ||
8 | <default revision="sumo" remote="gerrit-enea"/> | 8 | <default revision="warrior" remote="gerrit-enea"/> |
9 | 9 | ||
10 | <project name="linux/meta-el-accelerated" path="poky/meta-el-accelerated"/> | 10 | <project name="linux/meta-el-accelerated" path="poky/meta-el-accelerated"/> |
11 | 11 | ||
diff --git a/zcu102-zynqmp/.README b/intel-corei7-64/.README index 2dafa77..419cab4 100644 --- a/zcu102-zynqmp/.README +++ b/intel-corei7-64/.README | |||
@@ -1,7 +1,7 @@ | |||
1 | This file is a template used to produce the real README. Read that one instead. | 1 | This file is a template used to produce the real README. Read that one instead. |
2 | 2 | ||
3 | ________END_OF_HEADER________ | 3 | ________END_OF_HEADER________ |
4 | This file contains build and boot instructions for Enea Linux on Xilinx zcu102-zynqmp, | 4 | This file contains build and boot instructions for Enea Linux on intel-corei7-64, |
5 | accelerated profile. | 5 | accelerated profile. |
6 | 6 | ||
7 | ________INSERT_BUILD_SEQUENCES_HERE________ | 7 | ________INSERT_BUILD_SEQUENCES_HERE________ |
diff --git a/zcu102-zynqmp/README b/intel-corei7-64/README index 3d574e3..7e4b9d8 100644 --- a/zcu102-zynqmp/README +++ b/intel-corei7-64/README | |||
@@ -1,5 +1,5 @@ | |||
1 | This file contains build and boot instructions for Enea Linux on Xilinx zcu102-zynqmp, | 1 | This file contains build and boot instructions for Enea Linux on |
2 | accelerated profile. | 2 | intel-corei7-64, accelerated profile. |
3 | 3 | ||
4 | 4 | ||
5 | 5 | ||
diff --git a/zcu102-zynqmp/default.xml b/intel-corei7-64/default.xml index 87bc744..bce1a2a 100644 --- a/zcu102-zynqmp/default.xml +++ b/intel-corei7-64/default.xml | |||
@@ -3,17 +3,20 @@ | |||
3 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> | 3 | <remote fetch="ssh://gerrit.enea.se:29418/" name="gerrit-enea"/> |
4 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> | 4 | <remote fetch="ssh://git@git.enea.com/" name="git-enea"/> |
5 | 5 | ||
6 | <default remote="gerrit-enea" revision="sumo"/> | 6 | <default remote="gerrit-enea" revision="warrior"/> |
7 | |||
8 | <project name="linux/meta-el-common" remote="git-enea" path="poky/meta-el-common" upstream="warrior"/> | ||
9 | <project name="linux/meta-enea-bsp-common" remote="git-enea" path="poky/meta-enea-bsp-common" upstream="warrior"/> | ||
10 | |||
11 | <project name="linux/meta-intel" path="poky/meta-intel" remote="git-enea" upstream="warrior"/> | ||
12 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" remote="git-enea" revision="8d5dcd6522e9d15e68637b6d7dda0401f9bb91d0" upstream="warrior"/> | ||
13 | <project name="linux/poky" path="poky" remote="git-enea" revision="51223035e66c5b27799b15a0f8ebe75d24d3971b" upstream="warrior"/> | ||
7 | 14 | ||
8 | <project name="linux/meta-el-common" remote="git-enea" path="poky/meta-el-common" revision="13e2bdb030f67e2c75ff9873343c008bc13daf16" upstream="sumo"/> | ||
9 | <project name="linux/meta-enea-bsp-common" remote="git-enea" path="poky/meta-enea-bsp-common" revision="b20bd9277ff4cbfbdffc4ed48ab6644e7dc17ddd" upstream="sumo"/> | ||
10 | <project name="linux/meta-xilinx" path="poky/meta-xilinx" remote="git-enea" revision="7347663d3a30e3381e69de4b4798056ffd851546" upstream="thud"/> | ||
11 | <project name="linux/meta-openembedded" path="poky/meta-openembedded" remote="git-enea" revision="be79b8b111a968efdbe5e1482d0c246d0b24763e" upstream="sumo"/> | ||
12 | <project name="linux/meta-umLinx" path="poky/meta-umLinx" remote="git-enea" revision="8f8f477eded207d4b7bd6923d00693b54657bad1"/> | 15 | <project name="linux/meta-umLinx" path="poky/meta-umLinx" remote="git-enea" revision="8f8f477eded207d4b7bd6923d00693b54657bad1"/> |
13 | <project name="amp/meta-amp" path="poky/meta-amp" remote="git-enea" revision="02203e3484da33de7a3915dde5198873dca84727" upstream="sumo"/> | 16 | <project name="amp/meta-amp" path="poky/meta-amp" remote="git-enea" revision="02203e3484da33de7a3915dde5198873dca84727" upstream="sumo"/> |
14 | <project name="amp/meta-jailhouse" path="poky/meta-jailhouse" remote="git-enea" revision="d3c49e8ee7575581e661b2baea27d9ba5562850a"/> | 17 | <project name="amp/meta-jailhouse" path="poky/meta-jailhouse" remote="git-enea" revision="d3c49e8ee7575581e661b2baea27d9ba5562850a"/> |
15 | <project name="linux/poky" path="poky" remote="git-enea" revision="623b77885051174d0e05198843e739110977bd18" upstream="sumo"/> | ||
16 | 18 | ||
17 | <project name="linux/meta-enea-bsp-arm" path="poky/meta-enea-bsp-arm" upstream="sumo"/> | 19 | |
18 | <project name="linux/meta-el-accelerated" path="poky/meta-el-accelerated" upstream="sumo"/> | 20 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86" upstream="warrior"/> |
21 | <project name="linux/meta-el-accelerated" path="poky/meta-el-accelerated" upstream="warrior"/> | ||
19 | </manifest> | 22 | </manifest> |
diff --git a/zcu102-zynqmp/eltf.conf b/intel-corei7-64/eltf.conf index ecc2f48..b6b14f2 100644 --- a/zcu102-zynqmp/eltf.conf +++ b/intel-corei7-64/eltf.conf | |||
@@ -11,10 +11,10 @@ DELETE_SSTATE=NO | |||
11 | BOOTING_METHOD=NFS | 11 | BOOTING_METHOD=NFS |
12 | # TEST_PACKAGE_enea-image-standard=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script | 12 | # TEST_PACKAGE_enea-image-standard=healthcheck-runner,ddt-runner-ng,ltptest-runner,posix-runner,ptests-run-script |
13 | TEST_PACKAGE_enea-image-standard=healthcheck-runner,ltptest-runner,posix-runner | 13 | TEST_PACKAGE_enea-image-standard=healthcheck-runner,ltptest-runner,posix-runner |
14 | RC_TEST_PACKAGE_enea-image-standard=healthcheck-runner | 14 | RC_TEST_PACKAGE_enea-image-accelerated=healthcheck-runner |
15 | IMAGE_TYPES=enea-image-standard,enea-image-standard-sdk | 15 | IMAGE_TYPES=enea-image-accelerated,enea-image-accelerated-sdk |
16 | ESDK_IMAGE=enea-image-standard-sdk | 16 | ESDK_IMAGE=enea-image-accelerated-sdk |
17 | PKG_IMAGE=enea-image-standard-sdk | 17 | PKG_IMAGE=enea-image-accelerated-sdk |
18 | ARCHITECTURE=x86_64 | 18 | ARCHITECTURE=x86_64 |
19 | SKIP=NO | 19 | SKIP=NO |
20 | SKIP_TESTS=YES | 20 | SKIP_TESTS=YES |
diff --git a/intel-corei7-64/manifest_template.xml b/intel-corei7-64/manifest_template.xml new file mode 100644 index 0000000..4138dfe --- /dev/null +++ b/intel-corei7-64/manifest_template.xml | |||
@@ -0,0 +1,13 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2 | <manifest> | ||
3 | <!--Manifest template for intel-corei7-64 --> | ||
4 | |||
5 | <include name="common/common_manifest.xml"/> | ||
6 | |||
7 | <project name="linux/meta-intel" path="poky/meta-intel" revision="3fa29b9e6fe67f6a8df3098cf30f794c985b864c" upstream="warrior" remote="git-enea"/> | ||
8 | |||
9 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"/> | ||
10 | |||
11 | <project name="linux/meta-enea-bsp-x86" path="poky/meta-enea-bsp-x86"/> | ||
12 | |||
13 | </manifest> | ||
diff --git a/zcu102-zynqmp/manifest_template.xml b/zcu102-zynqmp/manifest_template.xml deleted file mode 100644 index 8f26f46..0000000 --- a/zcu102-zynqmp/manifest_template.xml +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="UTF-8"?> | ||
2 | <manifest> | ||
3 | <!--Manifest template for zcu102-zynqmp --> | ||
4 | |||
5 | <include name="common/common_manifest.xml"/> | ||
6 | |||
7 | <project name="linux/meta-xilinx" path="poky/meta-xilinx" revision="7347663d3a30e3381e69de4b4798056ffd851546" upstream="thud" remote="git-enea"/> | ||
8 | |||
9 | <project name="linux/meta-enea-bsp-common" path="poky/meta-enea-bsp-common"/> | ||
10 | |||
11 | <project name="linux/meta-enea-bsp-arm" path="poky/meta-enea-bsp-arm"/> | ||
12 | |||
13 | </manifest> | ||