From e26b7cc09f3d7738fcb62e15daec0381937635ee Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 1 Dec 2007 19:14:41 +0000
Subject: bitbake.conf/cross.bbclass: Add TOOLCHAIN_OPTIONS variable to allow
 passing of extra compiler options in future (e.g. sysroot) (from poky)

---
 conf/bitbake.conf | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'conf')

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 9d5d54bfb8..123d9ce7a7 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -311,12 +311,13 @@ export PATH_prepend = "${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${layout_sbi
 ##################################################################
 
 CCACHE = "${@bb.which(bb.data.getVar('PATH', d), 'ccache') and 'ccache '}"
+TOOLCHAIN_OPTIONS = ""
 
-export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
-export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}"
-export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}"
-export CPP = "${HOST_PREFIX}gcc -E"
-export LD = "${HOST_PREFIX}ld"
+export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+export CXX = "${CCACHE}${HOST_PREFIX}g++ ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+export F77 = "${CCACHE}${HOST_PREFIX}g77 ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
+export CPP = "${HOST_PREFIX}gcc -E${TOOLCHAIN_OPTIONS}"
+export LD = "${HOST_PREFIX}ld${TOOLCHAIN_OPTIONS}"
 export CCLD = "${CC}"
 export AR = "${HOST_PREFIX}ar"
 export AS = "${HOST_PREFIX}as"
-- 
cgit v1.2.3


From 7633bda2ba77ed03f25e1ce430395c8ed42634de Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 2 Dec 2007 09:19:02 +0000
Subject: ixp4xx.inc: Add redboot and apex features, and build a .tar.gz rootfs
 for direct disk booting.

---
 conf/machine/include/ixp4xx.inc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/machine/include/ixp4xx.inc b/conf/machine/include/ixp4xx.inc
index bc3b49c7c1..743b7ad362 100644
--- a/conf/machine/include/ixp4xx.inc
+++ b/conf/machine/include/ixp4xx.inc
@@ -3,7 +3,7 @@
 #@DESCRIPTION: genric machine configuration for ixp4xx platforms
 
 # Set default for nslu2 - can be overridden for machines with other features.
-MACHINE_FEATURES ?= "kernel26 usbhost ext2"
+MACHINE_FEATURES ?= "kernel26 usbhost ext2 redboot apex"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-ixp4xx"
 PREFERRED_VERSION_linux-ixp4xx ?= "2.6.21.6+svnr${SRCREV}"
@@ -21,9 +21,12 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= " \
 	kernel-module-via-velocity \
 	"
 
-# Set default for nslu2 - can be overridden for machines with more flash.
+# Set default for 16MB machines - can be overridden for more or less flash.
 ROOT_FLASH_SIZE ?= "12"
 
+# Allow for rootfs loaded direct from internal hard disk
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
+
 # Set default for nslu2, nas100d, dsmg600
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
 
-- 
cgit v1.2.3