From 2a404fc21c6fea8c492c657a623d212d5401dec1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 9 Mar 2015 12:54:43 +0100 Subject: meta-aarch64: drop ILP32 related bits Change-Id: Id1aca2e6ed453efea92f29a576a5c655bd5c758b Signed-off-by: Koen Kooi --- meta-aarch64/conf/machine/genericarmv8-ilp32.conf | 39 ---------------------- .../conf/machine/include/arm64/arch-armv8.inc | 29 ---------------- 2 files changed, 68 deletions(-) delete mode 100644 meta-aarch64/conf/machine/genericarmv8-ilp32.conf delete mode 100644 meta-aarch64/conf/machine/include/arm64/arch-armv8.inc (limited to 'meta-aarch64/conf') diff --git a/meta-aarch64/conf/machine/genericarmv8-ilp32.conf b/meta-aarch64/conf/machine/genericarmv8-ilp32.conf deleted file mode 100644 index 03e3a55a..00000000 --- a/meta-aarch64/conf/machine/genericarmv8-ilp32.conf +++ /dev/null @@ -1,39 +0,0 @@ -#@TYPE: Machine -#@NAME: generic armv8 machine -#@DESCRIPTION: generic machine to be used by linaro-media-create - -require conf/machine/include/arm64/arch-armv8.inc - -DEFAULTTUNE = "aarch64_ilp32" - -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" - -XSERVER ?= "xserver-xorg \ - mesa-driver-swrast \ - xf86-input-evdev \ - xf86-input-mouse \ - xf86-video-fbdev \ - xf86-input-keyboard" - -MACHINE_FEATURES = "" - -# Don't include kernels in standard images -RDEPENDS_kernel-base = "" - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro" - -KERNEL_IMAGETYPE = "Image" - -# We have to disable SERIAL_CONSOLE due to auto-serial-console -#SERIAL_CONSOLE = "115200 ttyAMA0" - -# Force auto-serial-console to be used by all image types -# Ideally this would be part of core oe or as a bbclassappend, -# but as we don't have an easy way to append a class, defining -# it here -EXTRA_IMAGE_FEATURES += "autoserial" -FEATURE_PACKAGES_autoserial = "auto-serial-console" - -# we do not want to have getty running on tty1 as we run -# auto-serial-console there -USE_VT = "0" diff --git a/meta-aarch64/conf/machine/include/arm64/arch-armv8.inc b/meta-aarch64/conf/machine/include/arm64/arch-armv8.inc deleted file mode 100644 index 5902d112..00000000 --- a/meta-aarch64/conf/machine/include/arm64/arch-armv8.inc +++ /dev/null @@ -1,29 +0,0 @@ -DEFAULTTUNE ?= "aarch64" - -ARMPKGARCH ?= "aarch64" - -TUNEVALID[aarch64] = "Enable instructions for aarch64" -TUNEVALID[bigendian] = "Enable big-endian mode." -TUNECONFLICTS[aarch64] = "" -MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "aarch64", ":aarch64", "" ,d)}" - -TUNEVALID[ilp32] = "Enable instructions for aarch64 32 bit mode" -#TUNECONFLICTS[ilp32] = "aarch64" -ABIEXTENSION .= "${@bb.utils.contains("TUNE_FEATURES", "ilp32", "ilp32", "" ,d)}" -TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "ilp32", " -mabi=ilp32", "", d)}" -MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "ilp32", ":aarchilp32", "" ,d)}" - -# Little Endian base configs -AVAILTUNES += "aarch64 aarch64_be aarch64_ilp32 aarch64_be_ilp32" -TUNE_FEATURES_tune-aarch64 ?= "aarch64" -TUNE_FEATURES_tune-aarch64_be ?= "${TUNE_FEATURES_tune-aarch64} bigendian" -TUNE_FEATURES_tune-aarch64_ilp32 ?= "aarch64 ilp32" -TUNE_FEATURES_tune-aarch64_be_ilp32 ?= "${TUNE_FEATURES_tune-aarch64} bigendian ilp32" - -ARMPKGSFX_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "_be", "", d)}" -ARMPKGSFX_ILP32 = "${@bb.utils.contains("TUNE_FEATURES", "ilp32", "_ilp32", "", d)}" - -TUNE_ARCH = "aarch64${ARMPKGSFX_ENDIAN}" -TUNE_PKGARCH = "aarch64${ARMPKGSFX_ENDIAN}${ARMPKGSFX_ILP32}" - -PACKAGE_EXTRA_ARCHS = "aarch64${ARMPKGSFX_ENDIAN}${ARMPKGSFX_ILP32}" -- cgit v1.2.3