From f87dfd61f416a8717af11ffe644633f34953ff19 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 15 Oct 2006 22:10:06 +0000 Subject: h4000: Try to organize machine settings per logical groups. --- conf/machine/h4000.conf | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'conf') diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index a9adfe4486..8f72ef6334 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -2,28 +2,25 @@ #@NAME: HP iPAQ h4xxx #@DESCRIPTION: Machine configuration for the HP iPAQ h4xxx - +# Hardware-based properties TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +include conf/machine/include/tune-xscale.conf +ROOT_FLASH_SIZE = "32" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget" +# Software/package selection +PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -ROOT_FLASH_SIZE = "32" -PCMCIA_MANAGER = "pcmciautils" - -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget" - -#autoload on boot: +# Modules autoload and other boot properies module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -GUI_MACHINE_CLASS = "smallscreen" - -include conf/machine/include/tune-xscale.conf - # LAB can only resolve relative symlinks ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " -- cgit v1.2.3 From 028ac8bdd9ef6aa1746980aea3e344c680c970af Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 15 Oct 2006 22:21:00 +0000 Subject: h2200: Organize machine seetings per logical groups. --- conf/machine/h2200.conf | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'conf') diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 1ead1aa919..ccabf64bd9 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -3,30 +3,27 @@ #@DESCRIPTION: Machine configuration for the HP iPAQ h22xx +# Hardware-based properties TARGET_ARCH = "arm" IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" +include conf/machine/include/tune-xscale.conf +ROOT_FLASH_SIZE = "32" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" +# Software/package selection +PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" - -ROOT_FLASH_SIZE = "32" -PCMCIA_MANAGER = "pcmciautils" - -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda usbgadget" - MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel" +EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000" -#autoload on boot: +# Modules autoload and other boot properties module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -GUI_MACHINE_CLASS = "smallscreen" - -include conf/machine/include/tune-xscale.conf - # LAB can only resolve relative symlinks ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " -- cgit v1.2.3 From 6008fc412bce7bd5930f073254c5caf50ddeae60 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 15 Oct 2006 22:27:53 +0000 Subject: LAB-settings.conf: Separate internal details of LAB support for machines which can use it. * Convert h2200 & h4000 to use it. --- conf/machine/h2200.conf | 3 +-- conf/machine/h4000.conf | 5 ++--- conf/machine/include/LAB-settings.conf | 8 ++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 conf/machine/include/LAB-settings.conf (limited to 'conf') diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index ccabf64bd9..a074eec4e9 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -25,5 +25,4 @@ module_autoload_snd-pcm-oss = "snd-pcm-oss" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -# LAB can only resolve relative symlinks -ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " +include conf/machine/include/LAB-settings.conf diff --git a/conf/machine/h4000.conf b/conf/machine/h4000.conf index 8f72ef6334..cff0a94392 100644 --- a/conf/machine/h4000.conf +++ b/conf/machine/h4000.conf @@ -15,12 +15,11 @@ PCMCIA_MANAGER = "pcmciautils" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -# Modules autoload and other boot properies +# Modules autoload and other boot properties module_autoload_snd-pcm-oss = "snd-pcm-oss" module_autoload_g_ether = "g_ether" SERIAL_CONSOLE = "115200 ttyS0 vt100" USE_VT = "0" -# LAB can only resolve relative symlinks -ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " +include conf/machine/include/LAB-settings.conf diff --git a/conf/machine/include/LAB-settings.conf b/conf/machine/include/LAB-settings.conf new file mode 100644 index 0000000000..576846fbdf --- /dev/null +++ b/conf/machine/include/LAB-settings.conf @@ -0,0 +1,8 @@ +# +# Settings for LAB (Linux As Bootloader) support. +# Machines which support (or want to support) LAB, +# include this. +# + +# LAB can only resolve relative symlinks +ROOTFS_POSTPROCESS_COMMAND += "make_zimage_symlink_relative; " -- cgit v1.2.3