From 399f5e157faf0889285d14969384fb882b23185e Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sun, 14 Nov 2004 12:00:59 +0000 Subject: Merge bk://openembedded@openembedded.bkbits.net/packages-devel into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/14 12:00:36+00:00 nexus.co.uk!pb simpad.conf: remove freeswan, since openswan is in handheld-common now. disable GPE_MACHINE_CLASS due to flash space constraints BKrev: 419748fbDbzcyMtMvSzYCNUHBhhJSw --- conf/machine/simpad.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 02681405df..ebf15346b7 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -6,9 +6,9 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules freeswan mipv6 atmelwlandriver" +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules mipv6 atmelwlandriver" BOOTSTRAP_EXTRA_RDEPENDS = "kernel" -BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules-cs orinoco-modules atmelwlandriver \ +BOOTSTRAP_EXTRA_RRECOMMENDS = "mipv6 hostap-modules-cs orinoco-modules atmelwlandriver \ kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ kernel-module-pcnet-cs kernel-module-8390" @@ -22,7 +22,7 @@ INHERIT += "simpad_flashimg" SERIAL_CONSOLE = "ttySA0 38400 vt100" USE_DEVFS = "1" -GPE_MACHINE_CLASS = "bigscreen" +#GPE_MACHINE_CLASS = "bigscreen" include conf/machine/handheld-common.conf include conf/machine/tune-strongarm.conf -- cgit v1.2.3