diff options
| author |   Simon Busch <morphis@amethyst.openembedded.net> | 2011-01-07 09:29:52 +0100 |
|---|---|---|
| committer | Simon Busch <morphis@amethyst.openembedded.net> | 2011-01-07 09:36:13 +0100 |
| commit | 471eef5612a7e0ee5d892fd0b266ddf608d8188e (patch) | |
| tree | 677dc23145bc24eb1bedffa14ca280d61c93aeeb | |
| parent | 3f405f35781ec81f29974e4bca8ce11c566e69a9 (diff) | |
| download | openembedded-471eef5612a7e0ee5d892fd0b266ddf608d8188e.tar.gz | |
palmpre machine: split into machine and common parts
Signed-off-by: Simon Busch <morphis@amethyst.openembedded.net>
| -rw-r--r-- | conf/machine/include/palmpre.inc | 34 | ||||
| -rw-r--r-- | conf/machine/palmpre.conf | 33 |
2 files changed, 35 insertions, 32 deletions
diff --git a/conf/machine/include/palmpre.inc b/conf/machine/include/palmpre.inc new file mode 100644 index 0000000000..1c84034270 --- /dev/null +++ b/conf/machine/include/palmpre.inc @@ -0,0 +1,34 @@ +# use this for overrides +MACHINE_CLASS = "palmpre" + +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-omapfb \ + xf86-input-keyboard" + +MACHINE_DISPLAY_WIDTH_PIXELS = "320" +MACHINE_DISPLAY_HEIGHT_PIXELS = "480" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "185" + +require conf/machine/include/omap3.inc + +# Copied from include/omap3.inc (as we do not use linux-omap recipes): +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r92" + +PREFERRED_PROVIDER_virtual/kernel = "linux-palmpre" + +IMAGE_FSTYPES += "tar.gz" + +# Let's keep the following three from the beagleboard machine config +UBOOT_MACHINE = "omap3_beagle_config" +PREFERRED_VERSION_u-boot = "git" +XLOAD_MACHINE = "omap3530beagle_config" + +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone bluetooth touchscreen keyboard wifi" +MACHINE_EXTRA_RDEPENDS = "tsmd read-tokens tellbootie lvm2 palmpre-audio-scripts" diff --git a/conf/machine/palmpre.conf b/conf/machine/palmpre.conf index eec6b6a29d..7bb47a0df1 100644 --- a/conf/machine/palmpre.conf +++ b/conf/machine/palmpre.conf @@ -1,36 +1,5 @@ #@TYPE: Machine #@NAME: Palm Pre machine #@DESCRIPTION: Machine configuration for the Palm Pre handset -TARGET_ARCH = "arm" -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -XSERVER = "xserver-xorg \ - xf86-input-evdev \ - xf86-input-mouse \ - xf86-video-omapfb \ - xf86-input-keyboard" - -MACHINE_DISPLAY_WIDTH_PIXELS = "320" -MACHINE_DISPLAY_HEIGHT_PIXELS = "480" -MACHINE_DISPLAY_ORIENTATION = "0" -MACHINE_DISPLAY_PPI = "185" - -require conf/machine/include/omap3.inc - -# Copied from include/omap3.inc (as we do not use linux-omap recipes): -# -# Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r92" - -# Put it below omap3.inc as we override the kernel here -PREFERRED_PROVIDER_virtual/kernel = "linux-palmpre" - -IMAGE_FSTYPES += "tar.gz" - -# Let's keep the following three from the beagleboard machine config -UBOOT_MACHINE = "omap3_beagle_config" -PREFERRED_VERSION_u-boot = "git" -XLOAD_MACHINE = "omap3530beagle_config" - -MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone bluetooth touchscreen keyboard wifi" -MACHINE_EXTRA_RDEPENDS = "tsmd read-tokens tellbootie lvm2 palmpre-audio-scripts" +require conf/machine/include/palmpre.inc |