diff options
Diffstat (limited to 'openembedded/conf/machine/include/ixp4xx.conf')
-rw-r--r-- | openembedded/conf/machine/include/ixp4xx.conf | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openembedded/conf/machine/include/ixp4xx.conf b/openembedded/conf/machine/include/ixp4xx.conf index 639bf4a74e..93befb92ce 100644 --- a/openembedded/conf/machine/include/ixp4xx.conf +++ b/openembedded/conf/machine/include/ixp4xx.conf | |||
@@ -62,7 +62,7 @@ IXP4XX_SUFFIX = "${MACHINE_ARCH}" | |||
62 | # arm/thumb interworking are enabled in the inputs. | 62 | # arm/thumb interworking are enabled in the inputs. |
63 | OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" | 63 | OVERRIDE_THUMB = "${@['', ':thumb'][bb.data.getVar('ARM_INSTRUCTION_SET', d, 1) == 'thumb']}" |
64 | OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" | 64 | OVERRIDE_INTERWORK = "${@['', ':thumb-interwork'][bb.data.getVar('THUMB_INTERWORK', d, 1) == 'yes']}" |
65 | OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}" | 65 | OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}:build-${BUILD_OS}:fail-fast" |
66 | 66 | ||
67 | # TARGET_CC_ARCH | 67 | # TARGET_CC_ARCH |
68 | # TARGET_CC_KERNEL_ARCH | 68 | # TARGET_CC_KERNEL_ARCH |
@@ -111,7 +111,7 @@ TARGET_PACKAGE_ARCH = "${TARGET_PACKAGE_ARCH_BASE}${BYTE_SEX_CHAR}" | |||
111 | # because everything built here is no more specific than that. | 111 | # because everything built here is no more specific than that. |
112 | MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}" | 112 | MACHINE_ARCH = "ixp4xx${ARCH_BYTE_SEX}" |
113 | 113 | ||
114 | # IPKG_ARCHS | 114 | # IPKG_EXTRA_ARCHS |
115 | # The full list of package architectures which should run on the system. | 115 | # The full list of package architectures which should run on the system. |
116 | # This takes into account both the board level issues and the INPUTS set | 116 | # This takes into account both the board level issues and the INPUTS set |
117 | # by the distro. The arm list is derived from the architecture settings | 117 | # by the distro. The arm list is derived from the architecture settings |
@@ -126,12 +126,12 @@ THUMB_ARCHITECTURES = "thumbe${BYTE_SEX_CHAR} thumbv4t${BYTE_SEX_CHAR} thumbv5t$ | |||
126 | # NOTE: this list contains just the things which rootfs_ipk.bbclass does | 126 | # NOTE: this list contains just the things which rootfs_ipk.bbclass does |
127 | # not add, rootfs_ipk.bbclass evaluates: | 127 | # not add, rootfs_ipk.bbclass evaluates: |
128 | # | 128 | # |
129 | # ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_ARCHS} ${MACHINE}" | 129 | # ipkgarchs="all any noarch ${TARGET_ARCH} ${IPKG_EXTRA_ARCHS} ${MACHINE}" |
130 | # | 130 | # |
131 | # This is a priority ordered list - most desireable architecture at the end, | 131 | # This is a priority ordered list - most desireable architecture at the end, |
132 | # so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if | 132 | # so put <ARM_INSTRUCTION_SET>_ARCHITECTURES at the end and, if |
133 | # THUMB_INTERWORK precede this with the other architectures. | 133 | # THUMB_INTERWORK precede this with the other architectures. |
134 | IPKG_ARCHS = "ixp4xx ${MACHINE} \ | 134 | IPKG_EXTRA_ARCHS = "ixp4xx ${MACHINE} \ |
135 | ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ | 135 | ${@(lambda arch_thumb, arch_arm, is_arm, interwork: \ |
136 | (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \ | 136 | (interwork and (is_arm and arch_thumb or arch_arm) + ' ' or '') \ |
137 | + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \ | 137 | + '${TARGET_ARCH} ' + (is_arm and arch_arm or arch_thumb)) \ |
@@ -146,7 +146,7 @@ IPKG_ARCHS = "ixp4xx ${MACHINE} \ | |||
146 | # the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and | 146 | # the removal of the raw "${MACHINE}" from the end of the list. ${MACHINE} and |
147 | # ixp4xx are included at the start (lower priority) as the non-byte-sex specific | 147 | # ixp4xx are included at the start (lower priority) as the non-byte-sex specific |
148 | # versions. | 148 | # versions. |
149 | IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_ARCHS}" | 149 | IPKG_ARCH_LIST = "all any noarch ixp4xx ${MACHINE} ${IPKG_EXTRA_ARCHS}" |
150 | 150 | ||
151 | #------------------------------------------------------------------------------- | 151 | #------------------------------------------------------------------------------- |
152 | # Package versions | 152 | # Package versions |