From cf7273dbd4790ceb705d9237f4cdc999d0ac81ed Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 30 Aug 2012 13:13:14 +0100 Subject: bsp: set default XSERVER for PowerPC and MIPS machines to Xorg (From meta-yocto rev: f43d6ca8ecd96321d62b11b5db3bb2a6de873939) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf | 7 +++++-- .../substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf index ae27fe6..b7c86e8 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf @@ -17,8 +17,11 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} {{ if xserver == "y": }} -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -XSERVER = "xserver-kdrive-fbdev" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xserver-xorg-extension-extmod \ + xf86-input-evdev \ + xf86-video-fbdev" SERIAL_CONSOLE = "115200 ttyS0" diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf index 18f5247..cbf3c32 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf @@ -41,8 +41,11 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" {{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} {{ if xserver == "y": }} -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -XSERVER = "xserver-kdrive-fbdev" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xserver-xorg-extension-extmod \ + xf86-input-evdev \ + xf86-video-fbdev" {{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x00000000" }} UBOOT_ENTRYPOINT = "{{=uboot_entrypoint}}" -- cgit v1.1