summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/include/ixp4xx.conf30
-rw-r--r--conf/machine/ixp4xx.conf2
-rw-r--r--conf/machine/ixp4xxbe.conf4
-rw-r--r--conf/machine/ixp4xxle.conf4
4 files changed, 3 insertions, 37 deletions
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index 582306bea0..1bab2f5fc7 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -8,36 +8,6 @@ EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-#-------------------------------------------------------------------------------
-# INPUTS
-#-------------------------------------------------------------------------------
-# conf/${DISTRO}.conf is included after this file and should be used to modify
-# variables identified as 'INPUTS' to the required values for the DISTRO, this
-# will cause the board specific settings (which depend for the most part on the
-# exact CPU used) to be set correctly within this file. The results are the
-# variables identifies here as 'OUTPUTS'
-#
-#variable = "default"
-# <possible values>
-# description
-
-DISTRO_BASE = ""
-# "" ":<base>"
-# If given this must be the name of a 'distro' to add to the bitbake OVERRIDES
-# after ${DISTRO}, this allows different distros to share a common base of
-# overrides. The value given must include a leading ':' or chaos will result.
-
-#-------------------------------------------------------------------------------
-# OUTPUTS
-#-------------------------------------------------------------------------------
-
-#OVERRIDES
-# The standard ':' separated list of overrides used by bitbake - see the
-# basic setting in bitbake.conf. This list is based on that used for the
-# standard setting however :<base> will be
-# inserted at appropriate points if a base distro is enabled in the inputs.
-OVERRIDES = "local:${MACHINE}:ixp4xx:${DISTRO}${DISTRO_BASE}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast"
-
require conf/machine/include/tune-xscale.conf
require conf/machine/include/tune-thumb.conf
diff --git a/conf/machine/ixp4xx.conf b/conf/machine/ixp4xx.conf
index 3397d170f8..0a1e54c324 100644
--- a/conf/machine/ixp4xx.conf
+++ b/conf/machine/ixp4xx.conf
@@ -2,4 +2,4 @@
#@NAME: Generic IXP4XX kernel
#@DESCRIPTION: Machine configuration for a generic ixp4xx board
-require conf/machine/include/ixp4xx.conf
+MACHINE_CHECK := ${@bb.fatal('You must set MACHINE to ixp4xxle or ixp4xxbe.')}
diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf
index d9737c9964..f208852d3a 100644
--- a/conf/machine/ixp4xxbe.conf
+++ b/conf/machine/ixp4xxbe.conf
@@ -3,10 +3,8 @@
#@DESCRIPTION: Machine configuration for a generic ixp4xx board in big-endian mode
TARGET_ARCH = "armeb"
-# PACKAGE_ARCH is set in tune-xscale.conf
-PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb"
-MACHINE_ARCH = "ixp4xxbe"
+PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb"
require conf/machine/include/ixp4xx.conf
diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf
index 4747fa50c4..d39fa1f603 100644
--- a/conf/machine/ixp4xxle.conf
+++ b/conf/machine/ixp4xxle.conf
@@ -3,10 +3,8 @@
#@DESCRIPTION: Machine configuration for a generic ixp4xx board in little-endian mode
TARGET_ARCH = "arm"
-# PACKAGE_ARCH is set in tune-xscale.conf
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
-MACHINE_ARCH = "ixp4xxle"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
require conf/machine/include/ixp4xx.conf