summaryrefslogtreecommitdiffstats
path: root/conf/machine/include
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/include')
-rw-r--r--conf/machine/include/machine-xilinx-board.inc6
-rw-r--r--conf/machine/include/machine-xilinx-default.inc41
-rw-r--r--conf/machine/include/machine-xilinx-qemu.inc49
-rw-r--r--conf/machine/include/microblaze/arch-microblaze.inc53
-rw-r--r--conf/machine/include/microblaze/feature-microblaze-math.inc33
-rw-r--r--conf/machine/include/microblaze/feature-microblaze-versions.inc67
-rw-r--r--conf/machine/include/tune-microblaze.inc19
-rw-r--r--conf/machine/include/tune-zynq.inc12
-rw-r--r--conf/machine/include/tune-zynqmp.inc11
-rw-r--r--conf/machine/include/zynqmp-pmu-config.inc20
10 files changed, 0 insertions, 311 deletions
diff --git a/conf/machine/include/machine-xilinx-board.inc b/conf/machine/include/machine-xilinx-board.inc
deleted file mode 100644
index ba9a36be..00000000
--- a/conf/machine/include/machine-xilinx-board.inc
+++ /dev/null
@@ -1,6 +0,0 @@
1# Default Xilinx Board settings
2
3EXTRA_IMAGEDEPENDS += "virtual/bootloader"
4
5IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}"
6
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc
deleted file mode 100644
index 522e0081..00000000
--- a/conf/machine/include/machine-xilinx-default.inc
+++ /dev/null
@@ -1,41 +0,0 @@
1# Default Xilinx BSP Machine settings
2
3MACHINE_FEATURES_BACKFILL_CONSIDERED += "rtc"
4
5# MicroBlaze cannot handle the execution of qemu-linux-user for gobject-introspection-data
6MACHINE_FEATURES_BACKFILL_CONSIDERED_append_microblaze = " qemu-usermode"
7
8# File System Configuration
9IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz.u-boot"
10
11# Kernel Configuration
12XILINX_DEFAULT_KERNEL := "linux-xlnx"
13XILINX_DEFAULT_KERNEL_microblaze := "linux-yocto"
14XILINX_DEFAULT_KERNEL_zynqmp := "linux-yocto"
15PREFERRED_PROVIDER_virtual/kernel ??= "${XILINX_DEFAULT_KERNEL}"
16
17# U-Boot Configuration
18XILINX_DEFAULT_UBOOT := "u-boot-xlnx"
19XILINX_DEFAULT_UBOOT_zynqmp := "u-boot"
20PREFERRED_PROVIDER_virtual/bootloader ??= "${XILINX_DEFAULT_UBOOT}"
21PREFERRED_PROVIDER_virtual/boot-bin ??= "${PREFERRED_PROVIDER_virtual/bootloader}"
22
23UBOOT_SUFFIX ?= "img"
24UBOOT_SUFFIX_zynqmp ?= "bin"
25UBOOT_SUFFIX_microblaze ?= "bin"
26
27UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
28UBOOT_ELF ?= "u-boot"
29UBOOT_ELF_aarch64 ?= "u-boot.elf"
30
31XSERVER ?= " \
32 xserver-xorg \
33 xf86-input-evdev \
34 xf86-input-mouse \
35 xf86-input-keyboard \
36 xf86-video-fbdev \
37 ${XSERVER_EXT} \
38 "
39
40XSERVER_EXT ?= ""
41XSERVER_EXT_zynqmp ?= "xf86-video-armsoc"
diff --git a/conf/machine/include/machine-xilinx-qemu.inc b/conf/machine/include/machine-xilinx-qemu.inc
deleted file mode 100644
index dd275f3b..00000000
--- a/conf/machine/include/machine-xilinx-qemu.inc
+++ /dev/null
@@ -1,49 +0,0 @@
1# This include is used to setup default QEMU and qemuboot config for meta-xilinx
2# machines.
3
4# depend on qemu-helper-native, which will depend on QEMU
5EXTRA_IMAGEDEPENDS += "qemu-helper-native"
6
7def qemu_default_dtb(d):
8 if d.getVar("IMAGE_BOOT_FILES", True):
9 dtbs = d.getVar("IMAGE_BOOT_FILES", True).split(" ")
10 # IMAGE_BOOT_FILES has extra renaming info in the format '<source>;<target>'
11 dtbs = [f.split(";")[0] for f in dtbs]
12 dtbs = [f for f in dtbs if f.endswith(".dtb")]
13 if len(dtbs) != 0:
14 return dtbs[0]
15 if d.getVar("KERNEL_DEVICETREE", True):
16 dtbs = d.getVar("KERNEL_DEVICETREE", True).split(" ")
17 dtbs = [os.path.basename(d) for d in dtbs]
18 if len(dtbs) != 0:
19 return d.getVar("KERNEL_IMAGETYPE", True) + "-" + dtbs[0]
20 return ""
21
22def qemu_default_serial(d):
23 if d.getVar("SERIAL_CONSOLE", True):
24 speed, console = d.getVar("SERIAL_CONSOLE", True).split(" ", 1)
25 # zynqmp uses earlycon and stdout (in dtb)
26 if "zynqmp" in d.getVar("MACHINEOVERRIDES", True).split(":"):
27 return ""
28 return "console=%s,%s earlyprintk" % (console, speed)
29 return ""
30
31def qemu_target_binary(d):
32 ta = d.getVar("TARGET_ARCH", True)
33 if ta == "microblazeeb":
34 ta = "microblaze"
35 elif ta == "arm":
36 ta = "aarch64"
37 return "qemu-system-%s" % ta
38
39def qemu_zynqmp_unhalt(d, multiarch):
40 if multiarch:
41 return "-global xlnx,zynqmp-boot.cpu-num=0 -global xlnx,zynqmp-boot.use-pmufw=true"
42 return "-device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4"
43
44# For qemuboot, default setup across all machines in meta-xilinx
45QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
46QB_DEFAULT_FSTYPE ?= "cpio"
47QB_DTB ?= "${@qemu_default_dtb(d)}"
48QB_KERNEL_CMDLINE_APPEND ?= "${@qemu_default_serial(d)}"
49
diff --git a/conf/machine/include/microblaze/arch-microblaze.inc b/conf/machine/include/microblaze/arch-microblaze.inc
deleted file mode 100644
index d79269cc..00000000
--- a/conf/machine/include/microblaze/arch-microblaze.inc
+++ /dev/null
@@ -1,53 +0,0 @@
1# MicroBlaze architecture tune feature configuration
2
3# Architecture feature and override
4TUNEVALID[microblaze] = "MicroBlaze"
5MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "microblaze:", "" ,d)}"
6
7# Endian
8TUNEVALID[bigendian] = "Use Microblaze Big Endian"
9TUNECONFLICTS[bigendian] += "v10.0"
10
11MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el" ,d)}"
12
13TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian" ,d)}"
14
15# General features
16TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter"
17TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions"
18TUNEVALID[reorder] = "Enable Reorder Instructions"
19TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20"
20
21# Core configuration tune optimizations
22TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)"
23TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6"
24
25# Feature compiler args
26TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift" ,d)}"
27TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare" ,d)}"
28TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}"
29
30# Disable reorder for v8.30 if pattern-compare is not enabled
31TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \
32 bb.utils.contains("TUNE_FEATURES", "v8.30", \
33 bb.utils.contains("TUNE_FEATURES", "pattern-compare", \
34 "-mxl-reorder", "-mno-xl-reorder", d), \
35 "-mxl-reorder", d), "-mno-xl-reorder", d)}"
36
37# Feature package architecture formatting
38MBPKGARCH_TUNE = ""
39MBPKGARCH_TUNE .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-bs", "" ,d)}"
40MBPKGARCH_TUNE .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-cmp", "" ,d)}"
41MBPKGARCH_TUNE .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", "-re", "" ,d)}"
42MBPKGARCH_TUNE .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-fo", "" ,d)}"
43
44# Additional features
45require conf/machine/include/microblaze/feature-microblaze-versions.inc
46require conf/machine/include/microblaze/feature-microblaze-math.inc
47
48# Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess
49TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el" ,d)}"
50
51# Package Architecture formatting
52TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
53
diff --git a/conf/machine/include/microblaze/feature-microblaze-math.inc b/conf/machine/include/microblaze/feature-microblaze-math.inc
deleted file mode 100644
index b2c7f071..00000000
--- a/conf/machine/include/microblaze/feature-microblaze-math.inc
+++ /dev/null
@@ -1,33 +0,0 @@
1# This include describes the math features (integer and floating point) that
2# are available for the MicroBlaze ISA
3
4TUNEVALID[multiply-low] = "Hardware multipler with 32 bit result"
5TUNEVALID[multiply-high] = "Hardware multipler with 64 bit result"
6TUNEVALID[divide-hard] = "Hardware divider"
7TUNEVALID[fpu-soft] = "Software FPU"
8TUNEVALID[fpu-hard] = "Hardware FPU in basic mode"
9TUNEVALID[fpu-hard-extended] = "Hardware FPU in extended mode (conversion and square root instructions)"
10
11TUNECONFLICTS[fpu-soft] = "fpu-hard fpu-hard-extended"
12TUNECONFLICTS[fpu-hard] = "fpu-soft"
13TUNECONFLICTS[fpu-hard-extended] = "fpu-soft"
14
15# Compiler args
16TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}"
17TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}"
18
19TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div' ,d)}"
20
21TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}"
22TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}"
23TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}"
24
25# Set target fpu (bitbake known target) to soft or hard (basic or extended)
26TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}"
27
28# Package Architecture formatting
29MBPKGARCH_MATH = ""
30MBPKGARCH_MATH .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mh', bb.utils.contains('TUNE_FEATURES', 'multiply-low', '-ml', '', d), d)}"
31MBPKGARCH_MATH .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-div', '' ,d)}"
32MBPKGARCH_MATH .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-fe', bb.utils.contains('TUNE_FEATURES', 'fpu-hard', '-fb', '', d), d)}"
33
diff --git a/conf/machine/include/microblaze/feature-microblaze-versions.inc b/conf/machine/include/microblaze/feature-microblaze-versions.inc
deleted file mode 100644
index 955674ff..00000000
--- a/conf/machine/include/microblaze/feature-microblaze-versions.inc
+++ /dev/null
@@ -1,67 +0,0 @@
1# MicroBlaze versions are defined as features, the features are setup to
2# conflict with other versions as well as unavailable features for particular
3# versions.
4#
5# Versions before v9.0 of MicroBlaze use a versioning scheme of "vX.YY.Z"
6# (where Z = [abc]). For v8.* versions of MicroBlaze the revision (Z) changes
7# did not affect ABI and are ignored by this tune configuration. Though this
8# format is expected by GCC including the revision, but this is defaulted to
9# ".a".
10#
11# Since v9.0 of MicroBlaze the revision (Z) part of versions was entirely
12# dropped and the version scheme was changed to "vX.Y".
13
14def microblaze_current_version(d, gcc = False):
15 import re
16 # find the current version, and convert it to major/minor integers
17 version = None
18 for t in (d.getVar("TUNE_FEATURES") or "").split():
19 m = re.search("^v(\d+)\.(\d+)", t)
20 if m:
21 version = int(m.group(1)), int(m.group(2))
22 break
23
24 # format the version string in generic or GCC specific formats
25 if version:
26 if version[0] <= 8:
27 return ("v%d.%02d" % version[0:2]) + (".a" if gcc else "")
28 else:
29 return "v%d.%d" % version[0:2]
30 return ""
31
32# MicroBlaze versions
33TUNEVALID[v8.00] = "MicroBlaze version 8.00"
34TUNEVALID[v8.10] = "MicroBlaze version 8.10"
35TUNEVALID[v8.20] = "MicroBlaze version 8.20"
36TUNEVALID[v8.30] = "MicroBlaze version 8.30"
37TUNEVALID[v8.40] = "MicroBlaze version 8.40"
38TUNEVALID[v8.50] = "MicroBlaze version 8.50"
39TUNEVALID[v9.0] = "MicroBlaze version 9.0"
40TUNEVALID[v9.1] = "MicroBlaze version 9.1"
41TUNEVALID[v9.2] = "MicroBlaze version 9.2"
42TUNEVALID[v9.3] = "MicroBlaze version 9.3"
43TUNEVALID[v9.4] = "MicroBlaze version 9.4"
44TUNEVALID[v9.5] = "MicroBlaze version 9.5"
45TUNEVALID[v9.6] = "MicroBlaze version 9.6"
46TUNEVALID[v10.0] = "MicroBlaze version 10.0"
47
48# Version conflict matrix
49TUNECONFLICTS[v8.00] = ""
50TUNECONFLICTS[v8.10] = "v8.00"
51TUNECONFLICTS[v8.20] = "v8.00 v8.10"
52TUNECONFLICTS[v8.30] = "v8.00 v8.10 v8.20"
53TUNECONFLICTS[v8.40] = "v8.00 v8.10 v8.20 v8.30"
54TUNECONFLICTS[v8.50] = "v8.00 v8.10 v8.20 v8.30 v8.40"
55TUNECONFLICTS[v9.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50"
56TUNECONFLICTS[v9.1] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0"
57TUNECONFLICTS[v9.2] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1"
58TUNECONFLICTS[v9.3] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2"
59TUNECONFLICTS[v9.4] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3"
60TUNECONFLICTS[v9.5] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4"
61TUNECONFLICTS[v9.6] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5"
62TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6"
63
64# Version flags
65TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}"
66MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}"
67
diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc
deleted file mode 100644
index 835de41b..00000000
--- a/conf/machine/include/tune-microblaze.inc
+++ /dev/null
@@ -1,19 +0,0 @@
1DEFAULTTUNE ?= "microblaze"
2
3require conf/machine/include/microblaze/arch-microblaze.inc
4
5AVAILTUNES += "microblaze"
6TUNE_FEATURES_tune-microblaze = "microblaze"
7PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
8
9# Linux Configuration
10KERNEL_IMAGETYPE ?= "linux.bin.ub"
11
12# U-Boot Configuration
13UBOOT_MACHINE ?= "microblaze-generic_config"
14
15# default to use the gdb 7.7.1
16PREFERRED_VERSION_gdb ?= "7.7.1"
17PREFERRED_VERSION_gdb-cross ?= "7.7.1"
18PREFERRED_VERSION_gdb-cross-canadian ?= "7.7.1"
19
diff --git a/conf/machine/include/tune-zynq.inc b/conf/machine/include/tune-zynq.inc
deleted file mode 100644
index 19e73412..00000000
--- a/conf/machine/include/tune-zynq.inc
+++ /dev/null
@@ -1,12 +0,0 @@
1DEFAULTTUNE ?= "cortexa9thf-neon"
2SOC_FAMILY ?= "zynq"
3
4require conf/machine/include/tune-cortexa9.inc
5require conf/machine/include/soc-family.inc
6
7# Linux Configuration
8KERNEL_IMAGETYPE ?= "uImage"
9
10# Set default load address.
11# Override with KERNEL_EXTRA_ARGS_<board> += "..." in machine file if required
12KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000"
diff --git a/conf/machine/include/tune-zynqmp.inc b/conf/machine/include/tune-zynqmp.inc
deleted file mode 100644
index 8d1f9537..00000000
--- a/conf/machine/include/tune-zynqmp.inc
+++ /dev/null
@@ -1,11 +0,0 @@
1DEFAULTTUNE ?= "aarch64"
2SOC_FAMILY ?= "zynqmp"
3
4require conf/machine/include/arm/arch-armv8.inc
5require conf/machine/include/soc-family.inc
6
7# Linux Configuration
8KERNEL_IMAGETYPE ?= "Image"
9
10# Support multilib on zynqmp
11DEFAULTTUNE_virtclass-multilib-lib32 ?= "armv7vethf-neon-vfpv4"
diff --git a/conf/machine/include/zynqmp-pmu-config.inc b/conf/machine/include/zynqmp-pmu-config.inc
deleted file mode 100644
index fd9e9809..00000000
--- a/conf/machine/include/zynqmp-pmu-config.inc
+++ /dev/null
@@ -1,20 +0,0 @@
1
2# Enable the use of zynqmp-pmu for specific recipes only
3def zynqmp_pmu_enable_for_bpns(d):
4 bpn = d.getVar("BPN")
5 crossbpns = ["binutils", "gcc"]
6 targetbpns = ["libgcc", "newlib", "libgloss"]
7 if bpn in targetbpns:
8 return True
9 if bpn in crossbpns and bb.data.inherits_class('cross', d):
10 return True
11 return False
12
13BBCLASSEXTEND_append = "${@' zynqmp-pmu' if zynqmp_pmu_enable_for_bpns(d) else ''}"
14
15# Add the pkgarch to the extra list, this is done to avoid warnings about
16# missing manifests due to implicit dependency chains on populate_sysroot when
17# a recipe/task depends on a IMAGE_EXTRADEPENDS/do_deploy task which is
18# provided by a zynqmp-pmu-* target.
19PACKAGE_EXTRA_ARCHS_append = " microblazeel-v9.2-bs-cmp"
20
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-11 10:05:32 +0000