zepto-mirrors/meta-zephyr
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-zephyr synced 2026-09-12 00:49:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

siteinfo-zephyr.bbclass: refactor siteinfo

Browse Source 
Move all SITEINFO_EXTRA_DATAFUNCS and PACKAGEQA_EXTRA_MACHDEFFUNCS
from various tune files (tune-arc.inc, tune-iamcu.inc, tune-nios2.inc)
into a a new siteinfo-zephyr.bbclass file. Although the original code did
not result in any obvious errors, in fact it did cause some multiconfig
problems.

[YOCTO#11166]

Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
This commit is contained in:
Juro Bystricky
2017-04-10 15:07:01 -07:00
parent d861fa09fd
commit bd4e0ee3e6
5 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
classes/siteinfo-zephyr.bbclass Normal file
View File

@@ -0,0 +1,28 @@
def arc_siteinfo_setfunc(archinfo, osinfo, targetinfo, d):
archinfo['arc'] = "endian-little bit-32 "
osinfo['linux'] = "common-linux common-glibc"
targetinfo['arc-linux'] = "arc-linux"
return archinfo, osinfo, targetinfo
SITEINFO_EXTRA_DATAFUNCS += "arc_siteinfo_setfunc"
def arc_machdata_setfunc(machdata, d):
machdata["elf"] = { "arc" : (195, 0, 0, True, 32), }
return machdata
PACKAGEQA_EXTRA_MACHDEFFUNCS += "arc_machdata_setfunc"
def iamcu_siteinfo_setfunc(archinfo, osinfo, targetinfo, d):
archinfo['iamcu'] = "endian-little bit-32 "
osinfo['linux'] = "common-linux common-glibc"
targetinfo['iamcu-linux'] = "iamcu-linux"
return archinfo, osinfo, targetinfo
SITEINFO_EXTRA_DATAFUNCS += "iamcu_siteinfo_setfunc"
def nios2_machdata_setfunc(machdata, d):
machdata["elf"] = {"nios2": (113, 0, 0, True, 32), }
return machdata
PACKAGEQA_EXTRA_MACHDEFFUNCS += "nios2_machdata_setfunc"

2
conf/distro/zephyr.conf
View File

@@ -12,3 +12,5 @@ TEST_TARGET = "QemuTargetZephyr"
TEST_SUITES = "zephyr"
TOOLCHAIN_TARGET_TASK += " newlib"
INHERIT += "siteinfo-zephyr"

13
conf/machine/include/tune-arc.inc
View File

@@ -19,16 +19,3 @@ TUNEVALID[nodata] = "ARC no-delete-null-pointer-checks"
TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'no-delete-null-pointer-checks', ' -fno-delete-null-pointer-checks', '', d)}"
AVAILTUNES += "no-delete-null-pointer-checks"
def arc_siteinfo_setfunc(archinfo, osinfo, targetinfo, d):
archinfo['arc'] = "endian-little bit-32 "
osinfo['linux'] = "common-linux common-glibc"
targetinfo['arc-linux'] = "arc-linux"
return archinfo, osinfo, targetinfo
SITEINFO_EXTRA_DATAFUNCS = "arc_siteinfo_setfunc"
def arc_machdata_setfunc(machdata, d):
machdata["elf"] = { "arc" : (195, 0, 0, True, 32), }
return machdata
PACKAGEQA_EXTRA_MACHDEFFUNCS = "arc_machdata_setfunc"

7
conf/machine/include/tune-iamcu.inc
View File

@@ -8,12 +8,5 @@ TUNE_CCARGS = "-miamcu -m32"
TUNE_ARCH = "i586"
TUNEVALID[iamcu] = "Intel MCU"
def iamcu_siteinfo_setfunc(archinfo, osinfo, targetinfo, d):
archinfo['iamcu'] = "endian-little bit-32 "
osinfo['linux'] = "common-linux common-glibc"
targetinfo['iamcu-linux'] = "iamcu-linux"
return archinfo, osinfo, targetinfo
SITEINFO_EXTRA_DATAFUNCS = "iamcu_siteinfo_setfunc"
PACKAGE_EXTRA_ARCHS_tune-iamcu = "iamcu"

6
conf/machine/include/tune-nios2.inc
View File

@@ -10,10 +10,4 @@ TUNE_CCARGS = ""
TUNEVALID[nios2] = "Altera Nios2"
def nios2_machdata_setfunc(machdata, d):
machdata["elf"] = {"nios2": (113, 0, 0, True, 32), }
return machdata
PACKAGEQA_EXTRA_MACHDEFFUNCS = "nios2_machdata_setfunc"
PACKAGE_EXTRA_ARCHS_tune-nios2 = "nios2"