From caf077679022f37ce55d758101f130e4e93bd7b5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 20 Nov 2006 17:40:20 +0000 Subject: bitbake.conf: Add MACHINE into the path for the CACHE (when set). Allow machines/distro to override IMAGE_ROOTFS_SIZE_ext2. Add DEPLOY_DIR_DEB. (from poky) --- conf/bitbake.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index b2d7e2b875..2d739f3bcc 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -139,7 +139,7 @@ FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}" ################################################################## TMPDIR = "${TOPDIR}/tmp" -CACHE = "${TMPDIR}/cache" +CACHE = "${TMPDIR}/cache${@['', '/' + str(bb.data.getVar('MACHINE', d, 1))][bool(bb.data.getVar('MACHINE', d, 1))]}" DL_DIR = "${TMPDIR}/downloads" CVSDIR = "${DL_DIR}/cvs" SVNDIR = "${DL_DIR}/svn" @@ -165,6 +165,7 @@ DEPLOY_DIR = "${TMPDIR}/deploy" DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar" DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk" DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm" +DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb" ################################################################## # Kernel info. @@ -197,8 +198,6 @@ EXTRA_IMAGECMD = "" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" EXTRA_IMAGECMD_squashfs = "-le -b 16384" EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384" -IMAGE_ROOTFS_SIZE_ext2 = "65536" -IMAGE_ROOTFS_SIZE_ext2.gz = "65536" IMAGE_DEPENDS = "" IMAGE_DEPENDS_jffs2 = "mtd-utils-native" @@ -419,7 +418,8 @@ require conf/sanity.conf IMAGE_FSTYPES ?= "jffs2" PCMCIA_MANAGER ?= "pcmcia-cs" MACHINE_TASK_PROVIDER ?= "task-bootstrap" - +IMAGE_ROOTFS_SIZE_ext2 ?= "65536" +IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" ################################################################## # Magic Cookie for SANITY CHECK -- cgit v1.2.3 From b00551ef66c6e11cca4b4aefdbb26f43d9257e5d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 20 Nov 2006 17:40:43 +0000 Subject: sanity.conf: Set minimum bitbake version to 1.6.2 --- conf/sanity.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/sanity.conf b/conf/sanity.conf index 6f30cd24ea..58313f27ca 100644 --- a/conf/sanity.conf +++ b/conf/sanity.conf @@ -3,6 +3,6 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "1.4.2" +BB_MIN_VERSION = "1.6.2" INHERIT += "sanity" -- cgit v1.2.3 From 7431b40c061dca0deea95d5e0009e8326ae84358 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Mon, 20 Nov 2006 20:16:10 +0000 Subject: mx21ads: Initial support for the Freescale IMX21ADS --- conf/machine/mx21ads.conf | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 conf/machine/mx21ads.conf (limited to 'conf') diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf new file mode 100644 index 0000000000..e88b3e3811 --- /dev/null +++ b/conf/machine/mx21ads.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@Name: Freescale MX21ADS +#@DESCRIPTION: Machine configuration for Freescale MX21ADS + +TARGET_ARCH = "arm" + +MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget" + +GUI_MACHINE_CLASS = "smallscreen" +IPKG_EXTRA_ARCHS = "arm armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" + +include conf/machine/include/tune-arm926ejs.conf + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttymxc0" + +# used by opie-collections.inc +ROOT_FLASH_SIZE = "32" -- cgit v1.2.3 From bd6fabb08f0bbb0cdbe99909d9e5b859d8faafe9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 20 Nov 2006 20:22:20 +0000 Subject: mx21ads.conf: Fix IPKG_EXTRA_ARHCS reference --- conf/machine/mx21ads.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/mx21ads.conf b/conf/machine/mx21ads.conf index e88b3e3811..77961714eb 100644 --- a/conf/machine/mx21ads.conf +++ b/conf/machine/mx21ads.conf @@ -7,7 +7,7 @@ TARGET_ARCH = "arm" MACHINE_FEATURES = "kernel26 apm alsa ext2 pcmcia usbhost usbgadget" GUI_MACHINE_CLASS = "smallscreen" -IPKG_EXTRA_ARCHS = "arm armv4t armv5te" +PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -- cgit v1.2.3 From 2b8176358284d1044c558428e97d674794f93b62 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 20 Nov 2006 22:22:22 +0000 Subject: h5xxx: Rename machine to h5000. * Use naming scheme consistent with other iPaq devices, where "series" name is used. * h5000 is series consisting of h5100, h5400, and h5500 models, each having common architecture, but slightly different builtin peripherals. Each model may also have few marketing nicknames, differing in last digit (sometimes 2 last digits). * Closes #1586. * Approved by Koen Kooi. --- conf/distro/angstrom-2007.1.conf | 2 +- conf/machine/h5000.conf | 33 +++++++++++++++++++++++++++++++++ conf/machine/h5xxx.conf | 33 --------------------------------- 3 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 conf/machine/h5000.conf delete mode 100644 conf/machine/h5xxx.conf (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index f593194ba6..05acebfa8f 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -33,7 +33,7 @@ FEED_ARCH_akita = "armv5te" FEED_ARCH_c7x0 = "armv5te" FEED_ARCH_h2200 = "armv5te" FEED_ARCH_h4000 = "armv5te" -FEED_ARCH_h5xxx = "armv5te" +FEED_ARCH_h5000 = "armv5te" FEED_ARCH_htcuniversal = "armv5te" FEED_ARCH_hx2000 = "armv5te" FEED_ARCH_hx4700 = "armv5te" diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf new file mode 100644 index 0000000000..ffc1328f50 --- /dev/null +++ b/conf/machine/h5000.conf @@ -0,0 +1,33 @@ +#@TYPE: Machine +#@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx +#@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices + +# +# Hardware-based properties +# +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h5xxx" + +require conf/machine/include/tune-xscale.conf + +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" + +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p" + +MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ + kernel-module-h5400_battery" + +# +# Modules autoload and other boot properties +# +SERIAL_CONSOLE = "115200 ttyS0 vt100" +USE_VT = "0" diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf deleted file mode 100644 index 5aac579e91..0000000000 --- a/conf/machine/h5xxx.conf +++ /dev/null @@ -1,33 +0,0 @@ -#@TYPE: Machine -#@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx -#@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices - -# -# Hardware-based properties -# -TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" - -require conf/machine/include/tune-xscale.conf - -ROOT_FLASH_SIZE = "32" -VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" - -# -# Software/packages selection -# -PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" - -MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ - kernel-module-h5400_battery" - -# -# Modules autoload and other boot properties -# -SERIAL_CONSOLE = "115200 ttyS0 vt100" -USE_VT = "0" -- cgit v1.2.3