diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2008-02-07 14:36:05 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-02-07 14:36:05 +0000 |
| commit | 24d1939f49e4e0d72d4caab27146424bee44eb49 (patch) | |
| tree | c265c220a8729bf6bc6ce117aa51b6380cd3d278 /conf/machine | |
| parent | 3489195f914c433ab0cc5a9e1f4b4e6911a39cb7 (diff) | |
| parent | 9d19825f572e93530dc6eae3f43d92d8b9f32e0f (diff) | |
merge of 'b281d50e8f5a095af5987accdb02c314cb86d1e0'
and 'dd027a8b3d308568f5c47f602615755d6bbb5d86'
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/fic-gta02.conf | 1 | ||||
| -rw-r--r-- | conf/machine/netvista.conf | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index bd9621413a..2c2034b1b6 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -26,7 +26,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01kbd \ kernel-module-s3cmci \ kernel-module-snd-soc-neo1973-gta02-wm8753 \ - kernel-module-snd-soc-smdk2440 \ " SERIAL_CONSOLE = "115200 ttySAC2" diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 3ee97a447e..f95e403367 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -1,12 +1,12 @@ #@TYPE: Machine -#@NAME: X86 -#@DESCRIPTION: Machine configuration for a Linux running on x86 compatible machines +#@NAME: Netvista J320 Internet Applicance +#@DESCRIPTION: Machine configuration for a Linux IBM 8365 / J320 PC-based internet terminals -# i386 doesn't work with NTPL, see http://ecos.sourceware.org/ml/libc-ports/2006-03/msg00030.html TARGET_ARCH = "i486" -# TARGET_VENDOR = "-oe" PACKAGE_EXTRA_ARCHS = "netvista" -PREFERRED_PROVIDER_virtual/kernel = "linux-x86" +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.23" + XSERVER = "xserver-kdrive-vesa" KERNEL_IMAGETYPE = "bzImage" |