summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-03-10 20:18:42 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-03-10 20:18:42 +0000
commit7f326402389de854bf6a0fe1f6c835502d93eeca (patch)
tree88755bbee8e49c1196d8909ff467745268ad3fe5 /conf/machine
parent2fb45b3e70da7b793a15983c45750321091a92dc (diff)
parentba1212299e2a4b2b99c1d058660273eb92327490 (diff)
merge of '90a304fce9cf13425fbf98afbbbec3593382bdf4'
and 'd51040bef3f49c55b9af42502e1891181802e97a'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/fic-gta01.conf9
-rw-r--r--conf/machine/turbostation.conf9
2 files changed, 10 insertions, 8 deletions
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index f6b35d721b..5450c1ebd3 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -11,25 +11,26 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gta01"
MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
-MACHINE_EXTRA_RDEPENDS = ""
+MACHINE_EXTRA_RDEPENDS = "alsa-state"
# package gta01 specific modules
MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-gta01-pm-bt \
kernel-module-gta01-pm-gps \
kernel-module-gta01-pm-gsm \
- kernel-module-gta01kbd "
+ kernel-module-gta01kbd \
+ alsa-state"
MACHINE_TASK_PROVIDER = "task-base"
# used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttySAC0"
+#SERIAL_CONSOLE = "115200 ttySAC0"
# used by some images
ROOT_FLASH_SIZE = "60"
# extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad=0x3C00000 -n"
# build tools
EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 7184958664..7f7d24c1e9 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -13,14 +13,15 @@ MACHINE_FEATURES= "kernel26 usbhost"
PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
# Do we need any kernel modules?
-OPENPROTIUM_KERNEL = ""
+OPENTURBOSTATION_KERNEL = ""
# We want udev support in the image
udevdir = "/dev"
-OPENPROTIUM_SUPPORT ?= "diffutils cpio findutils uboot-utils udev"
+TURBOSTATION_SUPPORT ?= "cpio uboot-utils udev"
BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
-ROOT_FLASH_SIZE = 12
-# Hardware stuff
+# Hardware stuff used in image generation
ERASEBLOCK_SIZE = "0x20000"
+JFFS2_ROOTFS_SIZE = "0xC80000"
+KERNEL_IMAGE_SIZE = "0x280000"
require conf/machine/include/tune-ppc603e.conf