storcenter: Update machine config

diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf
index 336c4e4..9b90103 100644 (file)
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -1,26 +1,37 @@
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc603e"
+TARGET_OS = "linux"
+TARGET_FPU = "hard"
+PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
 
-# terminal specs - console, but no other ports
-SERIAL_CONSOLE="115200 ttyS0"
-USE_VT="0"
+INHERIT += "storcenter-image"
+
+MACHINE_FEATURES               = "kernel26 usbhost pci ext2 uboot"
+MACHINE_FEATURES_foonas-em     = "kernel26"
+MACHINE_FEATURES_foonas-iscsi  = "kernel26"
+MACHINE_TASK_PROVIDER = "task-base"
+MACHINE_EXTRA_RDEPENDS = "u-boot-utils xfsprogs sccd"
+
+USE_DEVFS = "0"
 
-# uboot switches
-UBOOT_MACHINE="Sandpoint8240_config"
+BOOTSTRAP_EXTRA_RDEPENDS               = "udev module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS_foonas-iscsi  = "module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS_foonas-em     = "module-init-tools"
 
-# plug in other tasks - not "really" used unless we are using task-boot
-MACHINE_FEATURES= "kernel26 usbhost pci ext2"
 PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter"
-PREFERRED_VERSION_udev = "115"
+PREFERRED_VERSION_linux-storcenter = "2.6.27.7"
+PREFERRED_VERSION_u-boot = "1.2.0"
 
-# the StorCenter Control Daemon provides cmdline fan and light control
-MACHINE_EXTRA_RDEPENDS = "sccd"
+#don't try to access tty1
+USE_VT="0"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+IMAGE_FSTYPES                  = "tar.gz"
+IMAGE_FSTYPES_foonas-em                = "cpio.gz"
+IMAGE_FSTYPES_foonas-iscsi     = "cpio.gz"
 
-IMAGE_FSTYPES = "jffs2"
-KERNEL_IMAGETYPE ?= uImage
-EXTRA_IMAGECMD_jffs2 += "--pad --big-endian --eraseblock=0x10000"
-# must be in HEX
-FLASH_KERNEL_SIZE=0x170000
-FLASH_ROOT_SIZE=0x590000
+SERIAL_CONSOLE="115200 console"
 
 require conf/machine/include/tune-ppc603e.inc
+
+BB_EMMODE = "large"
+UBOOT_MACHINE = "storcenter"