Use OE reference qemuarm
-Replace qemuphosphor sample bsp with reference qemuarm.
-Pull in phosphor features via local.conf
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index caab032..2f0321f 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -9,7 +9,6 @@
##OEROOT##/meta \
##OEROOT##/meta-yocto \
##OEROOT##/meta-phosphor \
- ##OEROOT##/meta-phosphor/meta-sample-bsp \
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
diff --git a/conf/conf-notes.txt b/conf/conf-notes.txt
index 3570355..f2db15f 100644
--- a/conf/conf-notes.txt
+++ b/conf/conf-notes.txt
@@ -2,5 +2,4 @@
obmc-phosphor-image
You can also run generated qemu images with a command like:
- idir=tmp/deploy/images/qemuphosphor
- runqemu qemuarm $idir/zImage-qemuphosphor.bin $idir/obmc-phosphor-image-qemuphosphor.ext4
+ runqemu qemuarm
diff --git a/conf/distro/openbmc-phosphor.conf b/conf/distro/openbmc-phosphor.conf
index ee457c8..94f1752 100644
--- a/conf/distro/openbmc-phosphor.conf
+++ b/conf/distro/openbmc-phosphor.conf
@@ -25,3 +25,7 @@
obmc-phosphor-system-mgmt \
${DISTRO_FEATURES_LIBC} \
"
+
+MACHINE_FEATURES += " \
+ ${OBMC_MACHINE_FEATURES} \
+ "
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index e6b6d66..6a91927 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -34,7 +34,7 @@
#MACHINE ?= "edgerouter"
#
# This sets the default machine to be qemux86 if no other machine is selected:
-MACHINE ??= "qemuphosphor"
+MACHINE ??= "qemuarm"
#
# Where to place downloads
@@ -242,3 +242,5 @@
EXTRA_USERS_PARAMS = " \
usermod -p '\$1\$UGMqyqdG\$FZiylVFmRRfl9Z0Ue8G7e/' root; \
"
+
+require conf/machine/include/sample.inc
diff --git a/conf/machine/include/qemuphosphor.inc b/conf/machine/include/qemuphosphor.inc
deleted file mode 100644
index 04db4ba..0000000
--- a/conf/machine/include/qemuphosphor.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# The qemu helper scripts don't work with
-# cpio images.
-
-# Prefer linux-yocto with qemu.
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
diff --git a/conf/machine/include/sample.inc b/conf/machine/include/sample.inc
new file mode 100644
index 0000000..7db2883
--- /dev/null
+++ b/conf/machine/include/sample.inc
@@ -0,0 +1,19 @@
+OBMC_MACHINE_FEATURES += "\
+ obmc-phosphor-fan-mgmt \
+ obmc-phosphor-chassis-mgmt \
+ obmc-phosphor-sensor-mgmt \
+ obmc-phosphor-flash-mgmt \
+ "
+
+VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl = " \
+ obmc-phosphor-qemu \
+ "
+VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl = " \
+ obmc-phosphor-qemu \
+ "
+VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl = " \
+ obmc-phosphor-qemu \
+ "
+VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \
+ obmc-phosphor-qemu \
+ "
diff --git a/meta-sample-bsp/conf/layer.conf b/meta-sample-bsp/conf/layer.conf
deleted file mode 100644
index 90a037c..0000000
--- a/meta-sample-bsp/conf/layer.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have a recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "qemuphosphor"
-BBFILE_PATTERN_qemuphosphor = "^${LAYERDIR}/"
-LAYERVERSION_qemuphosphor = "1"
diff --git a/meta-sample-bsp/conf/machine/qemuphosphor.conf b/meta-sample-bsp/conf/machine/qemuphosphor.conf
deleted file mode 100644
index 076ac41..0000000
--- a/meta-sample-bsp/conf/machine/qemuphosphor.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-#@TYPE: Machine
-#@NAME: qemuphosphor
-#@DESCRIPTION: Machine configuration for qemuphosphor systems
-
-require conf/machine/include/qemu.inc
-require conf/machine/include/tune-arm926ejs.inc
-require conf/machine/include/qemuphosphor.inc
-
-KERNEL_IMAGETYPE = "zImage"
-SERIAL_CONSOLE = "115200 ttyAMA0"
-
-MACHINE_FEATURES += "\
- obmc-phosphor-fan-mgmt \
- obmc-phosphor-chassis-mgmt \
- obmc-phosphor-sensor-mgmt \
- obmc-phosphor-flash-mgmt \
- "
-
-VIRTUAL-RUNTIME_obmc-phosphor-fan-ctl = " \
- obmc-phosphor-qemu \
- "
-VIRTUAL-RUNTIME_obmc-phosphor-sensor-ctl = " \
- obmc-phosphor-qemu \
- "
-VIRTUAL-RUNTIME_obmc-phosphor-chassis-ctl = " \
- obmc-phosphor-qemu \
- "
-VIRTUAL-RUNTIME_obmc-phosphor-flash-ctl = " \
- obmc-phosphor-qemu \
- "
diff --git a/meta-sample-bsp/recipes-bsp/formfactor/formfactor/qemuphosphor/machconfig b/meta-sample-bsp/recipes-bsp/formfactor/formfactor/qemuphosphor/machconfig
deleted file mode 100644
index 54a7eab..0000000
--- a/meta-sample-bsp/recipes-bsp/formfactor/formfactor/qemuphosphor/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=n
-HAVE_KEYBOARD=n
diff --git a/meta-sample-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend b/meta-sample-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 6d4804d..0000000
--- a/meta-sample-bsp/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
diff --git a/meta-sample-bsp/recipes-core/init-ifupdown/init-ifupdown/qemuphosphor/interfaces b/meta-sample-bsp/recipes-core/init-ifupdown/init-ifupdown/qemuphosphor/interfaces
deleted file mode 100644
index d7409f7..0000000
--- a/meta-sample-bsp/recipes-core/init-ifupdown/init-ifupdown/qemuphosphor/interfaces
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/network/interfaces -- configuration file for ifup(8), ifdown(8)
-
-# The loopback interface
-auto lo
-iface lo inet loopback
diff --git a/meta-sample-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-sample-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-sample-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-sample-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuphosphor/xorg.conf b/meta-sample-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuphosphor/xorg.conf
deleted file mode 100644
index d191868..0000000
--- a/meta-sample-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/qemuphosphor/xorg.conf
+++ /dev/null
@@ -1,71 +0,0 @@
-
-Section "Files"
-EndSection
-
-Section "InputDevice"
- Identifier "Generic Keyboard"
- Driver "evdev"
- Option "CoreKeyboard"
- Option "Device" "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
- Option "XkbRules" "xorg"
- Option "XkbModel" "evdev"
- Option "XkbLayout" "us"
-EndSection
-
-Section "InputDevice"
- Identifier "Configured Mouse"
- Driver "mouse"
-
- Option "CorePointer"
- Option "Device" "/dev/input/mice"
- Option "Protocol" "ImPS/2"
- Option "ZAxisMapping" "4 5"
- Option "Emulate3Buttons" "true"
-EndSection
-
-Section "InputDevice"
- Identifier "Qemu Tablet"
- Driver "evdev"
- Option "CorePointer"
- Option "Device" "/dev/input/touchscreen0"
- Option "USB" "on"
-EndSection
-
-Section "Device"
- Identifier "Graphics Controller"
- Driver "fbdev"
-
-EndSection
-
-Section "Monitor"
- Identifier "Generic Monitor"
- Option "DPMS"
- # 1024x600 59.85 Hz (CVT) hsync: 37.35 kHz; pclk: 49.00 MHz
- Modeline "1024x600_60.00" 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync
- # 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
- ModeLine "640x480" 25.2 640 656 752 800 480 490 492 525 -hsync -vsync
- # 640x480 @ 72Hz (VESA) hsync: 37.9kHz
- ModeLine "640x480" 31.5 640 664 704 832 480 489 491 520 -hsync -vsync
- # 640x480 @ 75Hz (VESA) hsync: 37.5kHz
- ModeLine "640x480" 31.5 640 656 720 840 480 481 484 500 -hsync -vsync
- # 640x480 @ 85Hz (VESA) hsync: 43.3kHz
- ModeLine "640x480" 36.0 640 696 752 832 480 481 484 509 -hsync -vsync
-EndSection
-
-Section "Screen"
- Identifier "Default Screen"
- Device "Graphics Controller"
- Monitor "Generic Monitor"
- SubSection "Display"
- Modes "640x480"
- EndSubSection
-EndSection
-
-Section "ServerLayout"
- Identifier "Default Layout"
- Screen "Default Screen"
- InputDevice "Generic Keyboard"
- # InputDevice "Configured Mouse"
- InputDevice "QEMU Tablet"
- Option "AllowEmptyInput" "no"
-EndSection
diff --git a/meta-sample-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-sample-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
deleted file mode 100644
index 72d991c..0000000
--- a/meta-sample-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-preempt-rt.scc b/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-preempt-rt.scc
deleted file mode 100644
index b9260c7..0000000
--- a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-preempt-rt.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-define KMACHINE qemuphosphor
-define KTYPE preempt-rt
-define KARCH arm
-
-include ktypes/preempt-rt/preempt-rt.scc
-
-include qemuphosphor.scc
diff --git a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-standard.scc b/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-standard.scc
deleted file mode 100644
index 75cd200..0000000
--- a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-standard.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-define KMACHINE qemuphosphor
-define KTYPE standard
-define KARCH arm
-
-include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard
-
-include qemuphosphor.scc
diff --git a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-tiny.scc b/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-tiny.scc
deleted file mode 100644
index f479d81..0000000
--- a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-tiny.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-define KMACHINE qemuphosphor
-define KTYPE tiny
-define KARCH arm
-
-include ktypes/tiny/tiny.scc
-
-include qemuphosphor.scc
diff --git a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-user-config.cfg b/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-user-config.cfg
deleted file mode 100644
index e69de29..0000000
--- a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-user-config.cfg
+++ /dev/null
diff --git a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-user-features.scc b/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-user-features.scc
deleted file mode 100644
index e69de29..0000000
--- a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-user-features.scc
+++ /dev/null
diff --git a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-user-patches.scc b/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-user-patches.scc
deleted file mode 100644
index e69de29..0000000
--- a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor-user-patches.scc
+++ /dev/null
diff --git a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor.cfg b/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor.cfg
deleted file mode 100644
index e69de29..0000000
--- a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor.cfg
+++ /dev/null
diff --git a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor.scc b/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor.scc
deleted file mode 100644
index 52144aa..0000000
--- a/meta-sample-bsp/recipes-kernel/linux/files/qemuphosphor.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-kconf hardware qemuphosphor.cfg
-
-kconf hardware qemuphosphor-user-config.cfg
-include qemuphosphor-user-patches.scc
diff --git a/meta-sample-bsp/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-sample-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
deleted file mode 100644
index ce876ad..0000000
--- a/meta-sample-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-PR := "${PR}.1"
-
-COMPATIBLE_MACHINE_qemuphosphor = "qemuphosphor"
-
-KBRANCH_qemuphosphor = "standard/arm-versatile-926ejs"
-
-KERNEL_FEATURES_append_qemuphosphor += " cfg/smp.scc"
-
-SRC_URI += "file://qemuphosphor-standard.scc \
- "