summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-08-30 13:13:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-02 05:52:14 -0700
commitcf7273dbd4790ceb705d9237f4cdc999d0ac81ed (patch)
treeece9abc9191c868fe28087c71b0b296baee62285 /scripts
parente14a30b3c32be5072ff1adb0fcf1e8f185f90cbe (diff)
downloadpoky-cf7273dbd4790ceb705d9237f4cdc999d0ac81ed.tar.gz
bsp: set default XSERVER for PowerPC and MIPS machines to Xorg
(From meta-yocto rev: f43d6ca8ecd96321d62b11b5db3bb2a6de873939) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf7
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf7
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 ae27fe6a66..b7c86e8821 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}}%"
17 17
18{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} 18{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}
19{{ if xserver == "y": }} 19{{ if xserver == "y": }}
20PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" 20PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
21XSERVER = "xserver-kdrive-fbdev" 21XSERVER = "xserver-xorg \
22 xserver-xorg-extension-extmod \
23 xf86-input-evdev \
24 xf86-video-fbdev"
22 25
23SERIAL_CONSOLE = "115200 ttyS0" 26SERIAL_CONSOLE = "115200 ttyS0"
24 27
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 18f5247fad..cbf3c32c01 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}}%"
41 41
42{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} 42{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }}
43{{ if xserver == "y": }} 43{{ if xserver == "y": }}
44PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" 44PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
45XSERVER = "xserver-kdrive-fbdev" 45XSERVER = "xserver-xorg \
46 xserver-xorg-extension-extmod \
47 xf86-input-evdev \
48 xf86-video-fbdev"
46 49
47{{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x00000000" }} 50{{ input type:"edit" name:"uboot_entrypoint" prio:"40" msg:"Please specify a value for UBOOT_ENTRYPOINT:" default:"0x00000000" }}
48UBOOT_ENTRYPOINT = "{{=uboot_entrypoint}}" 51UBOOT_ENTRYPOINT = "{{=uboot_entrypoint}}"