From a931796b7c6b8a95405a30df6f7d8c66125d29c4 Mon Sep 17 00:00:00 2001 From: "Allen.Wang" Date: Fri, 7 Jun 2024 17:21:38 +0800 Subject: meta-facebook: install usbutils yosemite4 have many usb cascading from management board, spider board to sentinel dome, also there will have second source usbhub, so EE request include lsusb tool to list usb tree for debug and verification use. Multiple other systems already include usbutils, so add it everywhere. Tested: build and test on yosemite4 system ``` root@bmc:~# lsusb -t /: Bus 001.Port 001: Dev 001, Class=root_hub, Driver=platform-uhci/2p, 12M /: Bus 002.Port 001: Dev 001, Class=root_hub, Driver=ehci-platform/1p, 480M |__ Port 001: Dev 002, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 001: Dev 015, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 002: Dev 016, If 0, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 016, If 1, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 017, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 002: Dev 018, If 0, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 018, If 1, Class=[unknown], Driver=[none], 480M |__ Port 003: Dev 011, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 002: Dev 012, If 0, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 012, If 1, Class=[unknown], Driver=[none], 480M |__ Port 004: Dev 013, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 002: Dev 014, If 0, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 014, If 1, Class=[unknown], Driver=[none], 480M /: Bus 003.Port 001: Dev 001, Class=root_hub, Driver=ehci-platform/1p, 480M |__ Port 001: Dev 002, If 0, Class=[unknown], Driver=hub/3p, 480M |__ Port 001: Dev 003, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 001: Dev 047, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 002: Dev 048, If 0, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 048, If 1, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 041, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 002: Dev 042, If 0, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 042, If 1, Class=[unknown], Driver=[none], 480M |__ Port 003: Dev 043, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 002: Dev 044, If 0, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 044, If 1, Class=[unknown], Driver=[none], 480M |__ Port 004: Dev 045, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 002: Dev 046, If 0, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 046, If 1, Class=[unknown], Driver=[none], 480M |__ Port 002: Dev 004, If 0, Class=[unknown], Driver=hub/4p, 480M |__ Port 001: Dev 006, If 0, Class=[unknown], Driver=hub/7p, 480M |__ Port 001: Dev 010, If 0, Class=[unknown], Driver=[none], 480M |__ Port 003: Dev 025, If 0, Class=[unknown], Driver=[none], 480M |__ Port 005: Dev 035, If 0, Class=[unknown], Driver=ftdi_sio, 12M |__ Port 006: Dev 037, If 0, Class=[unknown], Driver=ftdi_sio, 12M |__ Port 007: Dev 039, If 0, Class=[unknown], Driver=ftdi_sio, 12M |__ Port 004: Dev 009, If 0, Class=[unknown], Driver=hub/7p, 480M |__ Port 001: Dev 011, If 0, Class=[unknown], Driver=[none], 480M |__ Port 003: Dev 026, If 0, Class=[unknown], Driver=[none], 480M |__ Port 005: Dev 036, If 0, Class=[unknown], Driver=ftdi_sio, 12M |__ Port 006: Dev 038, If 0, Class=[unknown], Driver=ftdi_sio, 12M |__ Port 007: Dev 040, If 0, Class=[unknown], Driver=ftdi_sio, 12M ``` Signed-off-by: Allen.Wang Change-Id: I857157fff1331cac5d2825d62af56b29ac525090 Signed-off-by: Patrick Williams --- .../recipes-phosphor/images/fb-bletchley-phosphor-image.inc | 1 - .../meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc | 5 ----- .../recipes-phosphor/images/fb-yosemite4-phosphor-image.inc | 1 - meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc | 3 ++- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc index 45f2428032..2f0cf7c069 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc +++ b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc @@ -3,7 +3,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ plat-svc \ motor-ctrl \ phosphor-virtual-sensor \ - usbutils \ idevicerestore \ fw-update \ phosphor-sel-logger \ diff --git a/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc b/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc index 3e6728f263..d59fb76c25 100644 --- a/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc +++ b/meta-facebook/meta-harma/recipes-phosphor/images/fb-harma-phosphor-image.inc @@ -15,11 +15,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-power-control \ " -# It is for lsusb app. -OBMC_IMAGE_EXTRA_INSTALL:append = " \ - usbutils \ -" - # Allow scripted access to SITV BMC OBMC_IMAGE_EXTRA_INSTALL:append = " \ sshpass \ diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc b/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc index fe7a36754d..81f687ed01 100644 --- a/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc +++ b/meta-facebook/meta-yosemite4/recipes-phosphor/images/fb-yosemite4-phosphor-image.inc @@ -25,4 +25,3 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ # This enables the feature of dbus-monitor which defined in # `meta-phosphor/classes/obmc-phosphor-images.bbclass` IMAGE_FEATURES:append = " obmc-dbus-monitor" - diff --git a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc index 84e4e40b40..375e36a765 100644 --- a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc +++ b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc @@ -18,8 +18,9 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ dbus-top \ jq \ strace \ - tmux \ tcpdump \ + tmux \ + usbutils \ wget \ " OBMC_IMAGE_EXTRA_INSTALL:append:mf-fb-secondary-emmc = " \ -- cgit v1.2.3