Skip to contentSkip to conversation

Add genericx86-64, cleanup residual atom-pc

PATCH New Darren Hart 1 participant 4 messages Aug 27, 2013

lore
Share & tools
lore
#0 lore raw

cover Add genericx86-64, cleanup residual atom-pc

This new genericx86_64 BSP has been boot tested on a Lenovo x220 and a Supermicro dual-socket Xeon 5680. Graphics and Ethernet work.

Known issue: fonts are excessively small. DPI listed as about 50. Could use some
help here with a follow-on patch.

Untested: uClibc config (copied from genericx86 with obvious fixes for x86_64)

The following changes since commit 325ee9b5fcebe902dfea78750502d8f6667d0a97:

gcc-4.8.inc: Allow lto to be configurable (2013-08-27 13:48:47 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib dvhart/genericx86_64
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dvhart/genericx86_64

Darren Hart (3):
meta-yocto-bsp: Add genericx86-64 machine local.conf.sample: Add genericx86-64 machine to machine list
atom-pc: Purge straggling configuration files

 meta-yocto-bsp/conf/machine/genericx86-64.conf     | 34 ++++++++++++++++++++++
 .../{atom-pc => genericx86-64}/machconfig          |  2 +-
 .../{atom-pc => genericx86-64}/uClibc.machine      |  8 ++---
 .../{atom-pc => genericx86-64}/xorg.conf           |  0
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend |  6 +++-
 meta-yocto/conf/local.conf.sample                  |  2 +-
 6 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 meta-yocto-bsp/conf/machine/genericx86-64.conf
 rename meta-yocto-bsp/recipes-bsp/formfactor/formfactor/{atom-pc => genericx86-64}/machconfig (97%)
 rename meta-yocto-bsp/recipes-core/uclibc/uclibc/{atom-pc => genericx86-64}/uClibc.machine (94%)
 rename meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/{atom-pc => genericx86-64}/xorg.conf (100%)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/3 meta-yocto-bsp: Add genericx86-64 machine

Duplicate the genericx86 machine, but select x86_64 tunables and use the common-pc-64 linux-yocto KMACHINE and config.

This has been boot tested with core-image-sato on a Lenovo x220 (Core-i5) and a Supermicro MBD-X8DTL-iF-O (dual-socket Xeon 5680).

Cc Ross Burton <[email protected]>
Cc Tom Zanussi <[email protected]>
Cc Bruce Ashfield <[email protected]>
---
 meta-yocto-bsp/conf/machine/genericx86-64.conf     | 34 +++++++++++
 .../formfactor/formfactor/genericx86-64/machconfig |  6 ++
 .../uclibc/uclibc/genericx86-64/uClibc.machine     | 69 ++++++++++++++++++++++
 .../xserver-xf86-config/genericx86-64/xorg.conf    |  0
 .../recipes-kernel/linux/linux-yocto_3.10.bbappend |  6 +-
 5 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 meta-yocto-bsp/conf/machine/genericx86-64.conf
 create mode 100644 meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86-64/machconfig
 create mode 100644 meta-yocto-bsp/recipes-core/uclibc/uclibc/genericx86-64/uClibc.machine
 create mode 100644 meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf
meta-yocto-bsp/conf/machine/genericx86-64.conf new file +34 -0
new file mode 100644
index 0000000..7825bae
@@ -0,0 +1,34 @@
+#@TYPE: Machine
+#@NAME: Generic X86_64.
+
+#@DESCRIPTION: Machine configuration for generic X86_64 (64-bit) PCs and servers. Supports a moderately wide range of drivers that should boot and be usable on "typical" hardware.
+
+include conf/machine/include/tune-x86_64.inc
+
+MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa efi pcbios"
+
+KERNEL_IMAGETYPE = "bzImage"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.10%"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
+           xserver-xorg-extension-glx \
+           xf86-input-mouse \
+           xf86-input-keyboard \
+           xf86-input-evdev \
+           xf86-input-synaptics \
+           xf86-video-fbdev \
+           xf86-video-modesetting \
+           xf86-video-vesa \
+           xf86-video-intel \
+           mesa-driver-i915 \
+           mesa-driver-i965"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts linux-firmware v86d"
+
+IMAGE_FSTYPES ?= "ext3 cpio.gz live"
+
+GLIBC_ADDONS = "nptl"
+
+EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi"
meta-yocto-bsp/recipes-bsp/formfactor/formfactor/genericx86-64/machconfig new file +6 -0
new file mode 100644
index 0000000..a81a23b
@@ -0,0 +1,6 @@
+HAVE_TOUCHSCREEN=0
+HAVE_KEYBOARD=1
+
+DISPLAY_CAN_ROTATE=0
+DISPLAY_ORIENTATION=0
+DISPLAY_DPI=133
meta-yocto-bsp/recipes-core/uclibc/uclibc/genericx86-64/uClibc.machine new file +69 -0

69 lines not on this page · raw message

meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/genericx86-64/xorg.conf new file +0 -0
new file mode 100644
index 0000000..e69de29
meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.10.bbappend +5 -1
index 5756e4c..c3968ef 100644
@@ -1,19 +1,23 @@
 KBRANCH_genericx86  = "standard/common-pc/base"
+KBRANCH_genericx86-64  = "standard/common-pc-64/base"
 KBRANCH_routerstationpro = "standard/routerstationpro"
 KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
 KBRANCH_beagleboard = "standard/beagleboard"
 
 KMACHINE_genericx86 ?= "common-pc"
+KMACHINE_genericx86-64 ?= "common-pc-64"
 
 SRCREV_machine_genericx86 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
+SRCREV_machine_genericx86-64 ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
 SRCREV_machine_routerstationpro ?= "3991d03bd450e9363d5b6e97ede0628ba073db79"
 SRCREV_machine_mpc8315e-rdb ?= "8d8339af518104db03f9c36b82f4372569e55b0a"
 SRCREV_machine_beagleboard ?= "6c1528b2b78d1ec7e75bb7a9880074ec35aa1aa0"
 
+COMPATIBLE_MACHINE_genericx86 = "genericx86"
+COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64"
 COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
 COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
 COMPATIBLE_MACHINE_beagleboard = "beagleboard"
-COMPATIBLE_MACHINE_genericx86 = "genericx86"
 
 # routerstationpro has a flash size of 16mb
 KERNEL_IMAGE_MAXSIZE_routerstationpro = "16777216"
Signature · 1 line
1.8.3.1
#2 lore raw

PATCH 2/3 local.conf.sample: Add genericx86-64 machine to machine list

In reply to Darren Hart

local.conf.sample lists all core BSPs. Add the new genericx86-64 machine, removing the duplicate entry of the genericx86 machine.

---
 meta-yocto/conf/local.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-yocto/conf/local.conf.sample +1 -1
index 6f71a9f..81fc121 100644
@@ -42,9 +42,9 @@
 # There are also the following hardware board target machines included for 
 # demonstration purposes:
 #
-#MACHINE ?= "genericx86"
 #MACHINE ?= "beagleboard"
 #MACHINE ?= "genericx86"
+#MACHINE ?= "genericx86-64"
 #MACHINE ?= "mpc8315e-rdb"
 #MACHINE ?= "routerstationpro"
 #
Signature · 1 line
1.8.3.1
#3 lore raw

PATCH 3/3 atom-pc: Purge straggling configuration files

In reply to Darren Hart

A few atom-pc configuration files escaped the last purge of atom-pc. Clean them up.

---
 .../formfactor/formfactor/atom-pc/machconfig       |  6 --
 .../uclibc/uclibc/atom-pc/uClibc.machine           | 69 ----------------------
 .../xserver-xf86-config/atom-pc/xorg.conf          |  0
 3 files changed, 75 deletions(-)
 delete mode 100644 meta-yocto-bsp/recipes-bsp/formfactor/formfactor/atom-pc/machconfig
 delete mode 100644 meta-yocto-bsp/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine
 delete mode 100644 meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf
meta-yocto-bsp/recipes-bsp/formfactor/formfactor/atom-pc/machconfig deleted +0 -6
deleted file mode 100644
index bef4ce3..0000000
@@ -1,6 +0,0 @@
-HAVE_TOUCHSCREEN=0
-HAVE_KEYBOARD=1
- 
-DISPLAY_CAN_ROTATE=0
-DISPLAY_ORIENTATION=0
-DISPLAY_DPI=133
meta-yocto-bsp/recipes-core/uclibc/uclibc/atom-pc/uClibc.machine deleted +0 -69

69 lines not on this page · raw message

meta-yocto-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/atom-pc/xorg.conf deleted +0 -0
deleted file mode 100644
index e69de29..0000000
Signature · 1 line
1.8.3.1