--- a/omap3530/beagleboard/rom/base_beagle.iby	Sun Nov 21 00:54:40 2010 +0000
+++ b/omap3530/beagleboard/rom/base_beagle.iby	Sun Nov 21 01:51:16 2010 +0000
@@ -104,10 +104,11 @@
 extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_i2c.dll			\sys\bin\i2c.dll
 
 #include <../omapshared/tps65950.iby>
+#ifdef USE_SPI
 #include <rom/omap3530/spi.iby>
-
+#endif
 #ifdef SYMBIAN_BASE_USE_GCE
-// Use the new GCE compliant display driver  
+// Use the new GCE compliant display driver
 	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd_gce.dll	\sys\bin\lcd.dll
 	device[VARID]=\epoc32\release\ARMV5\BUILD_DIR\display.ldd			\sys\bin\display0.ldd
 #ifndef EXCLUDE_SERIALKEYBOARD
@@ -152,4 +153,4 @@
 // VFP support
 extension[VARID]= \epoc32\release\ARMV5\BUILD_DIR\EVFP.DLL	\sys\bin\evfp.dll
 
-#endif
\ No newline at end of file
+#endif

--- a/omap3530/beagleboard/rom/kernel.iby	Sun Nov 21 00:54:40 2010 +0000
+++ b/omap3530/beagleboard/rom/kernel.iby	Sun Nov 21 01:51:16 2010 +0000
@@ -43,9 +43,12 @@
 //extension[VARID]=\Epoc32\Release\##KMAIN##\##BUILD##\resman.ldd           \sys\bin\resman.ldd
 
 #include <rom/omapshared/tps65950.iby>
-#include <rom/omap3530/spi.iby>
 
-#ifdef BYD_LCD
+#ifdef USE_SPI
+#include <rom/omap3530/spi.iby>
+#endif
+
+#ifdef BYD_TOUCH
 extension[VARID]=\Epoc32\Release\ARMV5\##BUILD##\_##VARIANT##_byd_xyin.dll  \sys\bin\byd_xyin.dll
 #endif