diff options
author | Mark Hatle <mark.hatle@amd.com> | 2022-11-15 11:51:14 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@amd.com> | 2022-11-15 11:51:14 -0800 |
commit | 398f4afbe0d8d063f368dd5d8f7bd1a14af28f35 (patch) | |
tree | b178eb780b425cdba18cb4d9ebad4110b6b28810 | |
parent | 1feb581fd2784d176e6e3847e0db0c5fedea7fe0 (diff) | |
parent | fb27f36ad989478bde5896b70886dd264975bd21 (diff) | |
download | meta-xilinx-398f4afbe0d8d063f368dd5d8f7bd1a14af28f35.tar.gz |
Merge remote-tracking branch 'langdale' into 2023
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
19 files changed, 235 insertions, 22 deletions
diff --git a/meta-xilinx-core/classes/xilinx-vars.bbclass b/meta-xilinx-core/classes/xilinx-vars.bbclass new file mode 100644 index 00000000..a1a0e38c --- /dev/null +++ b/meta-xilinx-core/classes/xilinx-vars.bbclass | |||
@@ -0,0 +1,26 @@ | |||
1 | # Check variable usage to make sure that the machine is probably configured | ||
2 | # properly. | ||
3 | addhandler xilinx_variables_config_eventhandler | ||
4 | xilinx_variables_config_eventhandler[eventmask] = "bb.event.ConfigParsed" | ||
5 | |||
6 | # It's up to the base sytem to define the variables being used here, we're | ||
7 | # only going to check them. | ||
8 | python xilinx_variables_config_eventhandler () { | ||
9 | # Verify HDF_MACHINE | ||
10 | hdf_prior = d.getVar('HDF_MACHINE_PRIOR') | ||
11 | hdf_final = d.getVar('HDF_MACHINE') | ||
12 | |||
13 | if hdf_prior and hdf_prior != hdf_final: | ||
14 | bb.fatal("HDF_MACHINE is set to %s, it appears you intended %s. " \ | ||
15 | "This is usually as a result of specifying it in the local.conf or before the 'require' in the machine .conf file. " \ | ||
16 | "See meta-xilinx-core/conf/machine/README." % (hdf_final, hdf_prior)) | ||
17 | |||
18 | # Verify DEFAULTTUNE | ||
19 | tune_prior = d.getVar('DEFAULTTUNE_PRIOR') | ||
20 | tune_final = d.getVar('DEFAULTTUNE') | ||
21 | |||
22 | if tune_prior and tune_prior != tune_final: | ||
23 | bb.fatal("The loaded DEFAULTTUNE is %s, but it appears you intended %s. " \ | ||
24 | "This is usually as a result of specifying it after the 'require' in the machine .conf file. " \ | ||
25 | "See meta-xilinx-core/conf/machine/README." % (tune_prior, tune_final)) | ||
26 | } | ||
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 8b6dff9a..0bc04c75 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf | |||
@@ -48,7 +48,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
48 | 48 | ||
49 | XILINX_RELEASE_VERSION ??= "v2023.1" | 49 | XILINX_RELEASE_VERSION ??= "v2023.1" |
50 | 50 | ||
51 | BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION" | 51 | BUILDCFG_VARS:append = " SOC_VARIANT XILINX_RELEASE_VERSION" |
52 | 52 | ||
53 | XILINX_QEMU_VERSION[v2022.1] = "v6.1.0-xilinx-v2022.1%" | 53 | XILINX_QEMU_VERSION[v2022.1] = "v6.1.0-xilinx-v2022.1%" |
54 | XILINX_QEMU_VERSION[v2022.2] = "v6.1.0-xilinx-v2022.2%" | 54 | XILINX_QEMU_VERSION[v2022.2] = "v6.1.0-xilinx-v2022.2%" |
diff --git a/meta-xilinx-core/conf/machine/README b/meta-xilinx-core/conf/machine/README index f455eb84..5361dc81 100644 --- a/meta-xilinx-core/conf/machine/README +++ b/meta-xilinx-core/conf/machine/README | |||
@@ -11,8 +11,12 @@ can be implements as: | |||
11 | k26_kv -> k26 -> zynqmp-ev-generic -> zynqmp-generic | 11 | k26_kv -> k26 -> zynqmp-ev-generic -> zynqmp-generic |
12 | 12 | ||
13 | The above needs to result MACHINEOVERRIDES and PACKAGE_ARCHS that include | 13 | The above needs to result MACHINEOVERRIDES and PACKAGE_ARCHS that include |
14 | all 4 machines. To accomplish this, each machine.conf file should contain | 14 | all 4 machines. This facilitates sstate-cache and binary distribution |
15 | the following preamble and postamble. | 15 | package re-use. |
16 | |||
17 | To accomplish this, each machine.conf file should contain the following | ||
18 | preamble and postamble. This ensures that the machine overrides and | ||
19 | package archs can be extended by another machine configuration file. | ||
16 | 20 | ||
17 | #### Preamble | 21 | #### Preamble |
18 | MACHINEOVERRIDES =. "${@['', '<machine>:']['<machine>' != '${MACHINE}']}" | 22 | MACHINEOVERRIDES =. "${@['', '<machine>:']['<machine>' != '${MACHINE}']}" |
@@ -24,10 +28,13 @@ MACHINEOVERRIDES =. "${@['', '<machine>:']['<machine>' != '${MACHINE}']}" | |||
24 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' <machine_arch>']['<machine>' != "${MACHINE}"]}" | 28 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' <machine_arch>']['<machine>' != "${MACHINE}"]}" |
25 | 29 | ||
26 | 30 | ||
27 | Typically the first thing after the preamble will be a requires of the machine | 31 | Between the Preamble and Postamble, you should "require" the machine |
28 | configuration that we depend on. After the machine would be changes to various | 32 | configuration that your machine is based on. After the 'require' is where |
29 | defaults. The exception is when a different microblaze tune and/or defaulttune | 33 | most variables should be defined. (See variable requirements at the end |
30 | is desired; these must be set before require of the inherited machine. | 34 | of this document.) This will allow you to extend other configurations |
35 | to match your specific requirements. Values should be set using = and | ||
36 | +=, but not :append or :prepend. This allows a machine inheriting your | ||
37 | machine file to add or overwrite the value easily. Such as: | ||
31 | 38 | ||
32 | Typical case example (my-example.conf): | 39 | Typical case example (my-example.conf): |
33 | 40 | ||
@@ -35,7 +42,7 @@ Typical case example (my-example.conf): | |||
35 | MACHINEOVERRIDES =. "${@['', 'my-example:']['my-example' != '${MACHINE}']}" | 42 | MACHINEOVERRIDES =. "${@['', 'my-example:']['my-example' != '${MACHINE}']}" |
36 | #### Regular settings follow | 43 | #### Regular settings follow |
37 | 44 | ||
38 | require conf/machine/zynqmp-ev-generic.conf | 45 | require conf/machine/zynqmp-generic.conf |
39 | 46 | ||
40 | HDF_MACHINE = "zcu102-zynqmp" | 47 | HDF_MACHINE = "zcu102-zynqmp" |
41 | MACHINE_FEATURES += "pci" | 48 | MACHINE_FEATURES += "pci" |
@@ -45,15 +52,20 @@ MACHINE_FEATURES += "pci" | |||
45 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' my_example']['my-example' != "${MACHINE}"]}" | 52 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' my_example']['my-example' != "${MACHINE}"]}" |
46 | 53 | ||
47 | 54 | ||
55 | A few variable must be set BEFORE the requires, DEFAULTTUNE for example. | ||
56 | (See variable requirements at the end of this document.) Usually ?= is the | ||
57 | correct way to set these, as the machine inheriting your machine may need | ||
58 | to override the value. | ||
59 | |||
48 | Example of defaulttune override: | 60 | Example of defaulttune override: |
49 | 61 | ||
50 | #### Preamble | 62 | #### Preamble |
51 | MACHINEOVERRIDES =. "${@['', 'my-example:']['my-example' != '${MACHINE}']}" | 63 | MACHINEOVERRIDES =. "${@['', 'my-example:']['my-example' != '${MACHINE}']}" |
52 | #### Regular settings follow | 64 | #### Regular settings follow |
53 | 65 | ||
54 | DEFAULTTUNE = "aarch64" | 66 | DEFAULTTUNE ?= "aarch64" |
55 | 67 | ||
56 | require conf/machine/zynqmp-ev-generic.conf | 68 | require conf/machine/zynqmp-generic.conf |
57 | 69 | ||
58 | HDF_MACHINE = "zcu102-zynqmp" | 70 | HDF_MACHINE = "zcu102-zynqmp" |
59 | MACHINE_FEATURES += "pci" | 71 | MACHINE_FEATURES += "pci" |
@@ -63,6 +75,9 @@ MACHINE_FEATURES += "pci" | |||
63 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' my_example']['my-example' != "${MACHINE}"]}" | 75 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' my_example']['my-example' != "${MACHINE}"]}" |
64 | 76 | ||
65 | 77 | ||
78 | Additionally, for microblaze you may need to define a specific microblaze | ||
79 | tune-features. Like DEFAULTTUNE, this needs to be set before the require line. | ||
80 | |||
66 | Example of microblaze tune override: | 81 | Example of microblaze tune override: |
67 | 82 | ||
68 | #### Preamble | 83 | #### Preamble |
@@ -79,3 +94,68 @@ SERIAL_CONSOLE = "115200,ttyUL0" | |||
79 | #### No additional settings should be after the Postamble | 94 | #### No additional settings should be after the Postamble |
80 | #### Postamble | 95 | #### Postamble |
81 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' my_example']['my-example' != "${MACHINE}"]}" | 96 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' my_example']['my-example' != "${MACHINE}"]}" |
97 | |||
98 | |||
99 | Variable Requirements | ||
100 | ===================== | ||
101 | |||
102 | The question has been raised why we don't use ?= or ??= for all default | ||
103 | values, instead we rely on specific ordering of the override components? | ||
104 | |||
105 | This is done intentionally, as it forces the user to create a new machine | ||
106 | configuration file to extend their system. In the past, it was common | ||
107 | for people to just set values in their local.conf file, but this lead to | ||
108 | problems reproducing success and failures, as well as trying to support | ||
109 | the overall configuration. Moving to a model where most variables must | ||
110 | be added to, or replaced after the require has simplified this model. | ||
111 | There are a few exception, these will be covered first. | ||
112 | |||
113 | The following variables must be set using ?= BEFORE the 'require' line | ||
114 | of the inherited base machine .conf file. This is due to them being | ||
115 | used to control inclusion of tune data. | ||
116 | |||
117 | DEFAULTTUNE - Default Tune for this machine | ||
118 | |||
119 | TUNEFILE[<tune>] - The tune file, based on DEFAULTTUNE, to load | ||
120 | |||
121 | For DEFAULTTUNE, see the Yocto Project documentation. For | ||
122 | TUNEFILE[<tune>] see include/soc-tune-include.inc for the defined ones. | ||
123 | |||
124 | |||
125 | The following variables should be set using ?= BEFORE the 'require' line | ||
126 | of the inherited base machine .conf file, if the user may override them. | ||
127 | If the values are fixed, then it should be set after the requires per | ||
128 | the next section. | ||
129 | |||
130 | These are common values a user may want to override and will let the user | ||
131 | easiy make a local change, if allowed by the machine .conf: | ||
132 | |||
133 | UBOOT_MACHINE - The defconfig for u-boot. (Note, this may be an error TBD). | ||
134 | |||
135 | SOC_VARIANT - See include/soc-*.inc (Note, most machines this is fixed). | ||
136 | |||
137 | |||
138 | The following variables must be set AFTER the 'require' line, using '=' | ||
139 | or '+='/'=+' as required. Using ':append', ':prepend', or ':remove' will | ||
140 | prevent an inheriting machine from overriding that value. Similarly | ||
141 | you should not use :<machine> override values for the same reason. Note, | ||
142 | not every machine file will have all of these variables, only the ones | ||
143 | you need to override should be set. | ||
144 | |||
145 | System wide setting: | ||
146 | TUNE_FEATURES:tune-<tune> - Specific tune features | ||
147 | |||
148 | external-hdf recipe from meta-xilinx-tools: | ||
149 | HDF_MACHINE - Used by the recipe to find the correct XSA | ||
150 | HDF_EXT - only xsa is supported, legacy variable | ||
151 | HDF_BASE - protocol if not using the default external-hdf repository | ||
152 | HDF_PATH - path to the repository or XSA file | ||
153 | |||
154 | device-tree recipe from meta-xilinx-tools: | ||
155 | YAML_DT_BOARD_FLAGS - flags used for dtgen | ||
156 | |||
157 | u-boot-xlnx recipe from meta-xilinx-core: | ||
158 | UBOOT_MACHINE - Name of the defconfig to use | ||
159 | HAS_PLATFORM_INIT - List of defconfig files available for u-boot | ||
160 | |||
161 | ...and more... | ||
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc index 7d3d45f3..06203985 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | |||
@@ -1,3 +1,6 @@ | |||
1 | # HDF_MACHINE should be set _AFTER_ this has been loaded | ||
2 | HDF_MACHINE_PRIOR := "${HDF_MACHINE}" | ||
3 | INHERIT += "xilinx-vars" | ||
1 | INHERIT += "xilinx-deprecated" | 4 | INHERIT += "xilinx-deprecated" |
2 | 5 | ||
3 | # Default Xilinx BSP Machine settings | 6 | # Default Xilinx BSP Machine settings |
diff --git a/meta-xilinx-core/conf/machine/include/soc-tune-include.inc b/meta-xilinx-core/conf/machine/include/soc-tune-include.inc index 539879d4..ad58cf92 100644 --- a/meta-xilinx-core/conf/machine/include/soc-tune-include.inc +++ b/meta-xilinx-core/conf/machine/include/soc-tune-include.inc | |||
@@ -10,6 +10,9 @@ TUNEFILE[cortexa72] = "conf/machine/include/arm/armv8a/tune-cortexa72.inc" | |||
10 | TUNEFILE[cortexa72-cortexa53] = "conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc" | 10 | TUNEFILE[cortexa72-cortexa53] = "conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc" |
11 | TUNEFILE[microblaze] = "conf/machine/include/xilinx-microblaze.inc" | 11 | TUNEFILE[microblaze] = "conf/machine/include/xilinx-microblaze.inc" |
12 | 12 | ||
13 | # Capture the defaulttune, to make sure it's been modified in the right order | ||
14 | DEFAULTTUNE_PRIOR := "${DEFAULTTUNE}" | ||
15 | |||
13 | # Default to arch-armv8a.inc | 16 | # Default to arch-armv8a.inc |
14 | TUNEFILE = "${@ d.getVarFlag('TUNEFILE', d.getVar('DEFAULTTUNE')) or 'conf/machine/include/arm/arch-armv8a.inc'}" | 17 | TUNEFILE = "${@ d.getVarFlag('TUNEFILE', d.getVar('DEFAULTTUNE')) or 'conf/machine/include/arm/arch-armv8a.inc'}" |
15 | 18 | ||
diff --git a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc index 0ae23b01..bdb72194 100644 --- a/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc +++ b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc | |||
@@ -2,12 +2,12 @@ DEFAULTTUNE ?= "cortexa72-cortexa53" | |||
2 | SOC_FAMILY ?= "zynqmp" | 2 | SOC_FAMILY ?= "zynqmp" |
3 | 3 | ||
4 | # Available SOC_VARIANT's for zynqmp: | 4 | # Available SOC_VARIANT's for zynqmp: |
5 | # "cg" - Zynq UltraScale+ CG Devices | 5 | # "cg" - Zynq UltraScale+ CG Devices (default lowest common denominator) |
6 | # "eg" - Zynq UltraScale+ EG Devices | 6 | # "eg" - Zynq UltraScale+ EG Devices |
7 | # "ev" - Zynq UltraScale+ EV Devices | 7 | # "ev" - Zynq UltraScale+ EV Devices |
8 | # "dr" - Zynq UltraScale+ DR Devices | 8 | # "dr" - Zynq UltraScale+ DR Devices |
9 | 9 | ||
10 | SOC_VARIANT ?= "eg" | 10 | SOC_VARIANT ?= "cg" |
11 | 11 | ||
12 | GRAPHICSOVERRIDES = "" | 12 | GRAPHICSOVERRIDES = "" |
13 | VCUOVERRIDES = "" | 13 | VCUOVERRIDES = "" |
diff --git a/meta-xilinx-core/conf/machine/versal-ai-core-generic.conf b/meta-xilinx-core/conf/machine/versal-ai-core-generic.conf new file mode 100644 index 00000000..34f57691 --- /dev/null +++ b/meta-xilinx-core/conf/machine/versal-ai-core-generic.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | #### Preamble | ||
2 | MACHINEOVERRIDES =. "${@['', 'versal-ai-core-generic:']['versal-ai-core-generic' != '${MACHINE}']}" | ||
3 | #### Regular settings follow | ||
4 | |||
5 | require conf/machine/versal-generic.conf | ||
6 | |||
7 | SOC_VARIANT = "ai-core" | ||
8 | |||
9 | #### No additional settings should be after the Postamble | ||
10 | #### Postamble | ||
11 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_ai_core_generic']['versal-ai-core-generic' != "${MACHINE}"]}" | ||
12 | |||
diff --git a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf new file mode 100644 index 00000000..bf5523ed --- /dev/null +++ b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | #### Preamble | ||
2 | MACHINEOVERRIDES =. "${@['', 'versal-ai-edge-generic:']['versal-ai-edge-generic' != '${MACHINE}']}" | ||
3 | #### Regular settings follow | ||
4 | |||
5 | require conf/machine/versal-generic.conf | ||
6 | |||
7 | SOC_VARIANT = "ai-edge" | ||
8 | |||
9 | #### No additional settings should be after the Postamble | ||
10 | #### Postamble | ||
11 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_ai_edge_generic']['versal-ai-edge-generic' != "${MACHINE}"]}" | ||
12 | |||
diff --git a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf new file mode 100644 index 00000000..23fffcb9 --- /dev/null +++ b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | #### Preamble | ||
2 | MACHINEOVERRIDES =. "${@['', 'versal-hbm-generic:']['versal-hbm-generic' != '${MACHINE}']}" | ||
3 | #### Regular settings follow | ||
4 | |||
5 | require conf/machine/versal-generic.conf | ||
6 | |||
7 | SOC_VARIANT = "hbm" | ||
8 | |||
9 | #### No additional settings should be after the Postamble | ||
10 | #### Postamble | ||
11 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_hbm_generic']['versal-hbm-generic' != "${MACHINE}"]}" | ||
12 | |||
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf index 1941235a..7b410aaa 100644 --- a/meta-xilinx-core/conf/machine/versal-net-generic.conf +++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf | |||
@@ -6,18 +6,12 @@ | |||
6 | MACHINEOVERRIDES =. "${@['', 'versal-net-generic:']['versal-net-generic' != '${MACHINE}']}" | 6 | MACHINEOVERRIDES =. "${@['', 'versal-net-generic:']['versal-net-generic' != '${MACHINE}']}" |
7 | #### Regular settings follow | 7 | #### Regular settings follow |
8 | 8 | ||
9 | SOC_VARIANT = "net" | ||
10 | |||
11 | # Must be set first, or versal-generic will set it | 9 | # Must be set first, or versal-generic will set it |
12 | UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig" | 10 | UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig" |
13 | 11 | ||
14 | require conf/machine/versal-generic.conf | 12 | require conf/machine/versal-generic.conf |
15 | 13 | ||
16 | #### REMOVE THE FOLLOWING WHEN BOOTGEN IS SYNCED | 14 | SOC_VARIANT = "net" |
17 | # required for bootgen native/nativesdk | ||
18 | MACHINEOVERRIDES:class-native = "versal-net" | ||
19 | MACHINEOVERRIDES:class-nativesdk = "versal-net" | ||
20 | #### REMOVE THE ABOVE | ||
21 | 15 | ||
22 | HDF_MACHINE = "versal-net-generic" | 16 | HDF_MACHINE = "versal-net-generic" |
23 | 17 | ||
diff --git a/meta-xilinx-core/conf/machine/versal-premium-generic.conf b/meta-xilinx-core/conf/machine/versal-premium-generic.conf new file mode 100644 index 00000000..d785edff --- /dev/null +++ b/meta-xilinx-core/conf/machine/versal-premium-generic.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | #### Preamble | ||
2 | MACHINEOVERRIDES =. "${@['', 'versal-premium-generic:']['versal-premium-generic' != '${MACHINE}']}" | ||
3 | #### Regular settings follow | ||
4 | |||
5 | require conf/machine/versal-generic.conf | ||
6 | |||
7 | SOC_VARIANT = "premium" | ||
8 | |||
9 | #### No additional settings should be after the Postamble | ||
10 | #### Postamble | ||
11 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_premium_generic']['versal-premium-generic' != "${MACHINE}"]}" | ||
12 | |||
diff --git a/meta-xilinx-core/conf/machine/versal-prime-generic.conf b/meta-xilinx-core/conf/machine/versal-prime-generic.conf new file mode 100644 index 00000000..94e9b05e --- /dev/null +++ b/meta-xilinx-core/conf/machine/versal-prime-generic.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | #### Preamble | ||
2 | MACHINEOVERRIDES =. "${@['', 'versal-prime-generic:']['versal-prime-generic' != '${MACHINE}']}" | ||
3 | #### Regular settings follow | ||
4 | |||
5 | require conf/machine/versal-generic.conf | ||
6 | |||
7 | SOC_VARIANT = "prime" | ||
8 | |||
9 | #### No additional settings should be after the Postamble | ||
10 | #### Postamble | ||
11 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_prime_generic']['versal-prime-generic' != "${MACHINE}"]}" | ||
12 | |||
diff --git a/meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf new file mode 100644 index 00000000..38c9126f --- /dev/null +++ b/meta-xilinx-core/conf/machine/zynqmp-cg-generic.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | #### Preamble | ||
2 | MACHINEOVERRIDES =. "${@['', 'zynqmp-cg-generic:']['zynqmp-cg-generic' != '${MACHINE}']}" | ||
3 | #### Regular settings follow | ||
4 | |||
5 | require conf/machine/zynqmp-generic.conf | ||
6 | |||
7 | SOC_VARIANT = "cg" | ||
8 | |||
9 | #### No additional settings should be after the Postamble | ||
10 | #### Postamble | ||
11 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_cg_generic']['zynqmp-cg-generic' != "${MACHINE}"]}" | ||
12 | |||
diff --git a/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf new file mode 100644 index 00000000..fbe445aa --- /dev/null +++ b/meta-xilinx-core/conf/machine/zynqmp-dr-generic.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | #### Preamble | ||
2 | MACHINEOVERRIDES =. "${@['', 'zynqmp-dr-generic:']['zynqmp-dr-generic' != '${MACHINE}']}" | ||
3 | #### Regular settings follow | ||
4 | |||
5 | require conf/machine/zynqmp-generic.conf | ||
6 | |||
7 | SOC_VARIANT = "dr" | ||
8 | |||
9 | #### No additional settings should be after the Postamble | ||
10 | #### Postamble | ||
11 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_dr_generic']['zynqmp-dr-generic' != "${MACHINE}"]}" | ||
12 | |||
diff --git a/meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf new file mode 100644 index 00000000..33375b46 --- /dev/null +++ b/meta-xilinx-core/conf/machine/zynqmp-eg-generic.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | #### Preamble | ||
2 | MACHINEOVERRIDES =. "${@['', 'zynqmp-eg-generic:']['zynqmp-eg-generic' != '${MACHINE}']}" | ||
3 | #### Regular settings follow | ||
4 | |||
5 | require conf/machine/zynqmp-generic.conf | ||
6 | |||
7 | SOC_VARIANT = "eg" | ||
8 | |||
9 | #### No additional settings should be after the Postamble | ||
10 | #### Postamble | ||
11 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_eg_generic']['zynqmp-eg-generic' != "${MACHINE}"]}" | ||
12 | |||
diff --git a/meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf new file mode 100644 index 00000000..f2ffe40f --- /dev/null +++ b/meta-xilinx-core/conf/machine/zynqmp-ev-generic.conf | |||
@@ -0,0 +1,12 @@ | |||
1 | #### Preamble | ||
2 | MACHINEOVERRIDES =. "${@['', 'zynqmp-ev-generic:']['zynqmp-ev-generic' != '${MACHINE}']}" | ||
3 | #### Regular settings follow | ||
4 | |||
5 | require conf/machine/zynqmp-generic.conf | ||
6 | |||
7 | SOC_VARIANT = "ev" | ||
8 | |||
9 | #### No additional settings should be after the Postamble | ||
10 | #### Postamble | ||
11 | PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_ev_generic']['zynqmp-ev-generic' != "${MACHINE}"]}" | ||
12 | |||
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index 32de4d50..c375d8e5 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf | |||
@@ -11,9 +11,6 @@ unset USE_BOARD | |||
11 | MACHINEOVERRIDES =. "${@['', 'zynqmp-generic:']['zynqmp-generic' != '${MACHINE}']}" | 11 | MACHINEOVERRIDES =. "${@['', 'zynqmp-generic:']['zynqmp-generic' != '${MACHINE}']}" |
12 | #### Regular settings follow | 12 | #### Regular settings follow |
13 | 13 | ||
14 | # CG is the lowest common demoninator, so use this by default | ||
15 | SOC_VARIANT ?= "cg" | ||
16 | |||
17 | require conf/machine/include/soc-zynqmp.inc | 14 | require conf/machine/include/soc-zynqmp.inc |
18 | require conf/machine/include/machine-xilinx-default.inc | 15 | require conf/machine/include/machine-xilinx-default.inc |
19 | require conf/machine/include/machine-xilinx-qemu.inc | 16 | require conf/machine/include/machine-xilinx-qemu.inc |
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc index c9c6545e..cc12b03e 100644 --- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc | |||
@@ -34,6 +34,7 @@ PACKAGECONFIG[alsa] = "--audio-drv-list=alsa,,alsa-lib" | |||
34 | PACKAGECONFIG[pulsedio] = "--audio-drv-list=pa,,pulseaudio" | 34 | PACKAGECONFIG[pulsedio] = "--audio-drv-list=pa,,pulseaudio" |
35 | PACKAGECONFIG[selinux] = "" | 35 | PACKAGECONFIG[selinux] = "" |
36 | PACKAGECONFIG[slirp] = "--enable-slirp=git,--disable-slirp,," | 36 | PACKAGECONFIG[slirp] = "--enable-slirp=git,--disable-slirp,," |
37 | PACKAGECONFIG[jack] = "" | ||
37 | 38 | ||
38 | DISABLE_STATIC:pn-${PN} = "" | 39 | DISABLE_STATIC:pn-${PN} = "" |
39 | 40 | ||
diff --git a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend index f8d7f6ab..13378fda 100644 --- a/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend | |||
@@ -1,6 +1,7 @@ | |||
1 | FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:" |
2 | 2 | ||
3 | SRC_URI:append:zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch" | 3 | SRC_URI:append:zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch" |
4 | SRC_URI:append:mali400 = " file://0002-libmali-does-not-support-gles3.patch" | ||
4 | 5 | ||
5 | # Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific | 6 | # Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific |
6 | SOC_FAMILY_ARCH ??= "${TUNE_PKGARCH}" | 7 | SOC_FAMILY_ARCH ??= "${TUNE_PKGARCH}" |