ti33x: move screen feature to machine configs
PATCH 1/1 ti33x: move screen feature to machine configs
The AM335x SoC has a built-in 16bit/24bit RGB LCD controller, and the BeagleBone Black uses an external chip to convert this to HDMI.
But the SoC does not have a video output port per-se, thus the "screen" machine feature does not belong to its configuration but rather to the machine configurations.
Move the feature (and the MACHINE_GUI_CLASS definition) out of ti33x.inc into am335x-evm.conf and beaglebone.conf respectively.
At the same time, drop the irrelevant comments regarding the external screen, since MACHINE_GUI_CLASS is unlikely used and the BeagleBone Black has a micro HDMI port, not a DVI port.
Signed-off-by Vivien Didelot <[email protected]>
--- conf/machine/am335x-evm.conf | 2 +- conf/machine/beaglebone.conf | 2 +- conf/machine/include/ti33x.inc | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-)
conf/machine/am335x-evm.conf +1 -1
@@ -5,7 +5,7 @@ require conf/machine/include/ti33x.inc MACHINE_GUI_CLASS = "smallscreen" -MACHINE_FEATURES += "touchscreen" +MACHINE_FEATURES += "screen touchscreen" IMAGE_FSTYPES += "ubifs ubi"
conf/machine/beaglebone.conf +1 -1
@@ -8,8 +8,8 @@ KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblue.dtb \ am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb" -# Only has DVI connector for external screen MACHINE_GUI_CLASS = "bigscreen" +MACHINE_FEATURES += "screen" SERIAL_CONSOLES = "115200;ttyS0"
conf/machine/include/ti33x.inc +1 -4
@@ -13,9 +13,6 @@ XSERVER = "xserver-xorg \ xf86-video-fbdev \ xf86-input-keyboard" -# Default to external video, change to smallscreen for built-in LCD -MACHINE_GUI_CLASS = "bigscreen" - # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r22"
@@ -62,7 +59,7 @@ UBI_VOLNAME = "rootfs" EXTRA_IMAGEDEPENDS += "virtual/bootloader" # List common SoC features, may need to add touchscreen for specific machines -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu" +MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu" # Set the list of device targets for ti-pdk class recipes TI_PDK_LIMIT_SOCS = "am335x"
Signature · 1 line
2.34.1