From 63040b62cbfeec043a229ab240006b104533d08f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 21 Jul 2010 15:42:40 -0700 Subject: distro: Add new feature to indicate thumb-interworking. * This would be used to decide if we can use BX in return instructions in uclibc. Signed-off-by: Khem Raj --- conf/distro/include/angstrom.inc | 3 +++ conf/distro/include/kaeilos.inc | 3 +++ conf/distro/include/slugos.inc | 9 +++++++++ conf/distro/minimal-uclibc.conf | 1 + conf/distro/minimal.conf | 1 + 5 files changed, 17 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index f13cc2223d..3ba94fa02a 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -204,3 +204,6 @@ DISTRO_FEATURES = "largefile ipv4 ipv6 nfs smbfs wifi ppp alsa bluetooth ext2 vf # Use-like features DISTRO_FEATURES += "tk" + +# Add thumb-interwork to feature list if selected machine supports it. +DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK', d, 1) == "yes"]}' diff --git a/conf/distro/include/kaeilos.inc b/conf/distro/include/kaeilos.inc index bdc4aadc87..edbad69990 100644 --- a/conf/distro/include/kaeilos.inc +++ b/conf/distro/include/kaeilos.inc @@ -214,3 +214,6 @@ DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbga # Use-like features DISTRO_FEATURES += "tk" + +# Add thumb-interwork to feature list if selected machine supports it. +DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK', d, 1) == "yes"]}' diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 807d45de61..8d53ffc0ec 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -23,9 +23,18 @@ DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # DISTRO_FEED ?= "${SLUGOS_VERSION}-${DISTRO_TYPE}" DISTRO_FEED ?= "unstable" +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. # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 vfat irda pcmcia usbgadget usbhost pci" +# Add thumb-interwork to feature list if selected machine supports it. +DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK', d, 1) == "yes"]}' + IMAGE_BASENAME = "${@['slugos${SITEINFO_ENDIANESS}', 'ucslugc'][bb.data.getVar('TARGET_OS', d, 1) == 'linux-uclibc']}" # The following need not be set, the defaults should be adequate diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index 44805cf9c3..287d6de2b4 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -44,3 +44,4 @@ DISTRO_FEATURES += "pam" DISTRO_FEATURES += "largefile" # glib-2.0 nneds ipv6 and there is no knob to control it DISTRO_FEATURES += "ipv4 ipv6" +DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK', d, 1) == "yes"]}' diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 9a081309e1..5fbbc33585 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -33,6 +33,7 @@ DISTRO_FEATURES += "eabi" # or higher DISTRO_FEATURES += "mplt" +DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK', d, 1) == "yes"]}' ############################################################################# # LIBRARY NAMES -- cgit 1.2.3-korg From 5ff203d2a623aeca47015e1729c5d6297702bdd3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 24 Jul 2010 09:38:25 +0200 Subject: angstrom: add ipkg to blacklist --- conf/distro/angstrom-2008.1.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 84e80968a8..e81808656a 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -147,6 +147,8 @@ ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4 ANGSTROM_BLACKLIST_pn-fso-apm = "regular apmd is good enough" +ANGSTROM_BLACKLIST_pn-ipkg = "ipkg has been superseded by opkg" + require conf/distro/include/angstrom.inc # Set DISTRO_FEED_CONFIGS to our config var, assigned in the above .inc -- cgit 1.2.3-korg