ixp4xx.conf,slugos.inc: Removed ARM_INSTRUCTION_SET and THUMB_INTERWORK, cause they are already set to defaults in tune-thumb.conf. Moved FULL_OPTIMIZATION to slugos.inc cause it's distro policy not inherent to the machine.

2 files changed, 12 insertions, 29 deletions

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 13f6bad29c..05bd57139c 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -65,6 +65,18 @@ INHERIT += "package_ipk debian"
 
 DISTRO_BASE = ":slugos"
 
+# FULL_OPTIMIZATION
+#    Optimization settings.  Os works fine and is significantly better than O2.
+#    The other settings are somewhat arbitrary.  The optimisations chosen here
+#    include the ones which 'break' symbolic debugging (because the compiler does
+#    not include enough information to allow the debugger to know where given
+#    values are.)  The -fno options are an attempt to cancel explicit use of space
+#    consuming options found in some packages (this isn't a complete list, this is
+#    just the ones which package writers seem to know about and abuse).
+FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \
+	-fno-unroll-loops -fno-inline-functions \
+	-fweb -funit-at-a-time"
+
 # packages/meta/slugos-image.bb generates a binary image of the root file system
 # with a name controlled by the following setting - it defaults to the top level
 # ${DISTRO_NAME} and this should always be correct, but it may be too specific (e.g.
diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf
index bc4e29b0e1..582306bea0 100644
--- a/conf/machine/include/ixp4xx.conf
+++ b/conf/machine/include/ixp4xx.conf
@@ -21,22 +21,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
 # <possible values>
 #    description
 
-ARM_INSTRUCTION_SET = "arm"
-# "arm" "thumb"
-#    The instruction set the compiler should use when generating application
-#    code.  The kernel is always compiled with arm code at present.  arm code
-#    is the original 32 bit ARM instruction set, thumb code is the 16 bit
-#    encoded RISC sub-set.  Thumb code is smaller (maybe 70% of the ARM size)
-#    but requires more instructions (140% for 70% smaller code) so may be
-#    slower.
-
-THUMB_INTERWORK = "yes"
-# "yes" "no"
-#    Whether to compile with code to allow interworking between the two
-#    instruction sets.  This allows thumb code to be executed on a primarily
-#    arm system and vice versa.  It is strongly recommended that DISTROs not
-#    turn this off - the actual cost is very small.
-
 DISTRO_BASE = ""
 # "" ":<base>"
 #    If given this must be the name of a 'distro' to add to the bitbake OVERRIDES
@@ -65,16 +49,3 @@ require conf/machine/include/tune-thumb.conf
 SERIAL_CONSOLE = "115200 ttyS0"
 KERNEL_CONSOLE = "ttyS0,115200n8"
 USE_VT = "0"
-
-# FULL_OPTIMIZATION
-#    Optimization settings.  Os works fine and is significantly better than O2.
-#    The other settings are somewhat arbitrary.  The optimisations chosen here
-#    include the ones which 'break' symbolic debugging (because the compiler does
-#    not include enough information to allow the debugger to know where given
-#    values are.)  The -fno options are an attempt to cancel explicit use of space
-#    consuming options found in some packages (this isn't a complete list, this is
-#    just the ones which package writers seem to know about and abuse).
-FULL_OPTIMIZATION = "-Os -fomit-frame-pointer -frename-registers \
-	-fno-unroll-loops -fno-inline-functions \
-	-fweb -funit-at-a-time"
-