diff options
Diffstat (limited to 'meta-facebook')
19 files changed, 275 insertions, 12 deletions
diff --git a/meta-facebook/conf/layer.conf b/meta-facebook/conf/layer.conf index 7ff4ac189..aa0e82f55 100644 --- a/meta-facebook/conf/layer.conf +++ b/meta-facebook/conf/layer.conf @@ -7,4 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "facebook-layer" BBFILE_PATTERN_facebook-layer := "^${LAYERDIR}/" -LAYERSERIES_COMPAT_facebook-layer := "zeus dunfell" +LAYERSERIES_COMPAT_facebook-layer := "dunfell gatesgarth" diff --git a/meta-facebook/conf/machine/include/facebook.inc b/meta-facebook/conf/machine/include/facebook.inc index 9b6e3ef73..9c9490bda 100644 --- a/meta-facebook/conf/machine/include/facebook.inc +++ b/meta-facebook/conf/machine/include/facebook.inc @@ -19,4 +19,6 @@ PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw ?= "phosphor-ipmi-kcs" PREFERRED_PROVIDER_virtual/obmc-inventory-data ?= "${VIRTUAL-RUNTIME_skeleton_workbook}" PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-fb-apps" +IMAGE_FEATURES_remove = "obmc-ikvm" + OVERRIDES .= ":facebook" diff --git a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample b/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample index f0ae07c32..a452dd666 100644 --- a/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample +++ b/meta-facebook/meta-tiogapass/conf/bblayers.conf.sample @@ -15,7 +15,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-webserver \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ ##OEROOT##/meta-facebook \ ##OEROOT##/meta-facebook/meta-tiogapass \ " @@ -29,7 +28,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-openembedded/meta-webserver \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ ##OEROOT##/meta-facebook \ ##OEROOT##/meta-facebook/meta-tiogapass \ " diff --git a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed/0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed/0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch new file mode 100644 index 000000000..4bec6c8d5 --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed/0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch @@ -0,0 +1,39 @@ +From 44cdd36855728059e58dcad52b42d825bb1cc2af Mon Sep 17 00:00:00 2001 +From: Paul Fertser <fercerpav@gmail.com> +Date: Fri, 25 Sep 2020 18:36:45 +0300 +Subject: [PATCH] configs/ast-common: use 57600 baud rate to match Tioga Pass + EFI firmware + +This is a Tioga Pass specific patch, only for +meta-facebook/meta-tiogapass layer. + +Signed-off-by: Paul Fertser <fercerpav@gmail.com> +--- + include/configs/ast-common.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/configs/ast-common.h b/include/configs/ast-common.h +index a0243083bd..f0f2ae08b6 100644 +--- a/include/configs/ast-common.h ++++ b/include/configs/ast-common.h +@@ -56,7 +56,7 @@ + #define CONFIG_SYS_LOADS_BAUD_CHANGE + #define CONFIG_SERIAL1 1 + #define CONFIG_CONS_INDEX 1 +-#define CONFIG_BAUDRATE 115200 ++#define CONFIG_BAUDRATE 57600 + + /* + * BOOTP options +@@ -96,7 +96,7 @@ + #define CONFIG_CMD_MTDPARTS + #endif + +-#define CONFIG_BOOTARGS "console=ttyS4,115200n8 root=/dev/ram rw" ++#define CONFIG_BOOTARGS "console=ttyS4,57600n8 root=/dev/ram rw" + + #define CONFIG_AST_SPI_NOR /* AST SPI NOR Flash */ + #define CONFIG_FMC_CS 1 +-- +2.17.1 + diff --git a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend new file mode 100644 index 000000000..b9bf0af2a --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "file://0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch" diff --git a/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend new file mode 100644 index 000000000..f24fe5e4f --- /dev/null +++ b/meta-facebook/meta-tiogapass/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-aspeed:" +SRC_URI += "file://0001-configs-ast-common-use-57600-baud-rate-to-match-Tiog.patch" diff --git a/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed/tiogapass.cfg b/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed/tiogapass.cfg index 7ea8dc31a..7fd89e2a2 100644 --- a/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed/tiogapass.cfg +++ b/meta-facebook/meta-tiogapass/recipes-kernel/linux/linux-aspeed/tiogapass.cfg @@ -4,3 +4,15 @@ CONFIG_RTC_DRV_RV8803=y CONFIG_TCG_TPM=y CONFIG_TCG_TIS_I2C_INFINEON=y CONFIG_NCSI_OEM_CMD_GET_MAC=y +CONFIG_IPV6_SIT=n +CONFIG_I2C_SLAVE=y +CONFIG_SENSORS_PXE1610=y +CONFIG_SENSORS_INA2XX=y +CONFIG_SOC_ASPEED=y +CONFIG_IPMB_DEVICE_INTERFACE=y +CONFIG_PECI=y +CONFIG_PECI_CHARDEV=y +CONFIG_PECI_ASPEED=y +CONFIG_SENSORS_PECI_DIMMTEMP=y +CONFIG_SENSORS_PECI_CPUTEMP=y +CONFIG_MFD_INTEL_PECI_CLIENT=y diff --git a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample index 4e094efb6..30d405903 100644 --- a/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample +++ b/meta-facebook/meta-yosemitev2/conf/bblayers.conf.sample @@ -15,7 +15,6 @@ BBLAYERS ?= " \ ##OEROOT##/meta-openembedded/meta-webserver \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ ##OEROOT##/meta-facebook \ ##OEROOT##/meta-facebook/meta-yosemitev2 \ " @@ -29,7 +28,6 @@ BBLAYERS_NON_REMOVABLE ?= " \ ##OEROOT##/meta-openembedded/meta-webserver \ ##OEROOT##/meta-phosphor \ ##OEROOT##/meta-aspeed \ - ##OEROOT##/meta-openpower \ ##OEROOT##/meta-facebook \ ##OEROOT##/meta-facebook/meta-yosemitev2 \ " diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-Add-Mux-for-yosemitev2.patch b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-Mux-for-yosemitev2.patch index 5634ce936..5634ce936 100644 --- a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-board-aspeed-Add-Mux-for-yosemitev2.patch +++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0001-board-aspeed-Add-Mux-for-yosemitev2.patch diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch new file mode 100755 index 000000000..cccdd04b5 --- /dev/null +++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed/0002-spl-host-console-handle.patch @@ -0,0 +1,184 @@ +From ca2c08a7e710e4beff2fdf17bba5a74adff13db8 Mon Sep 17 00:00:00 2001 +From: Manikandan Elumalai <manikandan.hcl.ers.epl@gmail.com> +Date: Wed, 10 Jun 2020 17:53:59 +0530 +Subject: [PATCH] spl-host-console-handle + +This patch adds four 1S server console through debug card +connected to YosemiteV2 during boot. + +Handswitch in the adaptor card connected to AST2500 GPIOs as below, +GPIOAA7 ---SW_ID8 +GPIOAA6 ---SW_ID4 +GPIOAA5 ---SW_ID2 +GPIOAA4 ---SW_ID1 + +SW_ID8 SW_ID4 SW_ID2 SW_ID1 Position Descritpion +L L L L 1 1s server slot1 select + +L L H 2 1s server slot2 select + +L L H L 3 1s server slot3 select + +L L H H 4 1s server slot4 select + +L H L L 5 BMC Debug port select + +L H L H 6 1s server slot1 select + +L H H L 7 1s server slot2 select + +L H H H 8 1s server slot3 select + +H L L L 9 1s server slot4 select + +H L L H 10 BMC Debug port select + +BMC and Hosts UART control flow +GPIOE0 --- DEBUG_UART_SEL_0 +GPIOE1 --- DEBUG_UART_SEL_1 +GPIOE2 --- DEBUG_UART_SEL_2 +GPIOE2 --- DEBUG_UART_RX_SEL_N + +SEL_2 SEL_1 SEL_0 RX_SEL_N CONSOLE +0 0 0 0 SLOT1 +0 0 1 0 SLOT2 +0 1 0 0 SLOT3 +0 1 1 0 SLOT4 +1 0 0 1 BMC Debug + +Signed-off-by: Manikandan Elumalai <manikandan.hcl.ers.epl@gmail.com> +--- + arch/arm/mach-aspeed/platform_g5.S | 68 +++++++++++++++++++++++++++++++++----- + 1 file changed, 60 insertions(+), 8 deletions(-) + +diff --git a/arch/arm/mach-aspeed/platform_g5.S b/arch/arm/mach-aspeed/platform_g5.S +index c3ce077..29daa7a 100644 +--- a/arch/arm/mach-aspeed/platform_g5.S ++++ b/arch/arm/mach-aspeed/platform_g5.S +@@ -315,6 +315,58 @@ orr r1, r1, #0xC + str r1, [r0] + .endm + ++ .macro console_slot1 ++ ldr r0, =0x1e780024 ++ ldr r1, [r0] ++ orr r1, r1, #0xF ++ str r1, [r0] ++ ++ ldr r0, =0x1e780020 ++ ldr r1, [r0] ++ and r1, r1, #0xFFFFFFF0 ++ orr r1, r1, #0x0 ++ str r1, [r0] ++ .endm ++ ++ .macro console_slot2 ++ ldr r0, =0x1e780024 ++ ldr r1, [r0] ++ orr r1, r1, #0xF ++ str r1, [r0] ++ ++ ldr r0, =0x1e780020 ++ ldr r1, [r0] ++ and r1, r1, #0xFFFFFFF0 ++ orr r1, r1, #0x1 ++ str r1, [r0] ++ .endm ++ ++ .macro console_slot3 ++ ldr r0, =0x1e780024 ++ ldr r1, [r0] ++ orr r1, r1, #0xF ++ str r1, [r0] ++ ++ ldr r0, =0x1e780020 ++ ldr r1, [r0] ++ and r1, r1, #0xFFFFFFF0 ++ orr r1, r1, #0x2 ++ str r1, [r0] ++ .endm ++ ++ .macro console_slot4 ++ ldr r0, =0x1e780024 ++ ldr r1, [r0] ++ orr r1, r1, #0xF ++ str r1, [r0] ++ ++ ldr r0, =0x1e780020 ++ ldr r1, [r0] ++ and r1, r1, #0xFFFFFFF0 ++ orr r1, r1, #0x3 ++ str r1, [r0] ++ .endm ++ + .macro console_sel + + // Disable SoL UARTs[1-4] +@@ -354,28 +406,28 @@ dbg_card_pres\@: + ldr r1, =0x00 + cmp r0, r1 + bne case_pos2\@ +- console_bmc ++ console_slot1 + b case_end\@ + case_pos2\@: + //Test for position#2 + ldr r1, =0x01 + cmp r0, r1 + bne case_pos3\@ +- console_bmc ++ console_slot2 + b case_end\@ + case_pos3\@: + //Test for position#3 + ldr r1, =0x02 + cmp r0, r1 + bne case_pos4\@ +- console_bmc ++ console_slot3 + b case_end\@ + case_pos4\@: + //Test for position#4 + ldr r1, =0x03 + cmp r0, r1 + bne case_pos5\@ +- console_bmc ++ console_slot4 + b case_end\@ + case_pos5\@: + //Test for position#5 +@@ -389,28 +441,28 @@ case_pos6\@: + ldr r1, =0x05 + cmp r0, r1 + bne case_pos7\@ +- console_bmc ++ console_slot1 + b case_end\@ + case_pos7\@: + //Test for position#7 + ldr r1, =0x06 + cmp r0, r1 + bne case_pos8\@ +- console_bmc ++ console_slot2 + b case_end\@ + case_pos8\@: + //Test for position#8 + ldr r1, =0x07 + cmp r0, r1 + bne case_pos9\@ +- console_bmc ++ console_slot3 + b case_end\@ + case_pos9\@: + //Test for position#9 + ldr r1, =0x08 + cmp r0, r1 + bne case_pos10\@ +- console_bmc ++ console_slot4 + b case_end\@ + case_pos10\@: + //Test for position#10 +-- +2.7.4 diff --git a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend index 51d98a504..1c38b11ba 100644 --- a/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend +++ b/meta-facebook/meta-yosemitev2/recipes-bsp/u-boot/u-boot-aspeed_%.bbappend @@ -1,2 +1,3 @@ -FILESEXTRAPATHS_prepend_yosemitev2 := "${THISDIR}/${PN}:" -SRC_URI_append_yosemitev2 = " file://0002-board-aspeed-Add-Mux-for-yosemitev2.patch" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI +="file://0001-board-aspeed-Add-Mux-for-yosemitev2.patch" +SRC_URI +="file://0002-spl-host-console-handle.patch" diff --git a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb index 4419828ec..b68ecc56d 100755 --- a/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb +++ b/meta-facebook/recipes-fb/ipmi/fb-ipmi-oem_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9e69ba356fa59848ffd865152a3ccc13" SRC_URI = "git://github.com/openbmc/fb-ipmi-oem" -SRCREV = "d1194024b4d39b111960d72fb59fe429bf51c19c" +SRCREV = "17cf1349b9452a61e8303fa757a7e8ff64146626" S = "${WORKDIR}/git" PV = "0.1+git${SRCPV}" @@ -15,6 +15,7 @@ DEPENDS = "boost phosphor-ipmi-host phosphor-logging systemd " inherit cmake obmc-phosphor-ipmiprovider-symlink EXTRA_OECMAKE="-DENABLE_TEST=0 -DYOCTO=1" +EXTRA_OECMAKE_append_yosemitev2 = " -DBIC=1" LIBRARY_NAMES = "libzfboemcmds.so" diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index 1dcc7cbf4..86fac887c 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -6,6 +6,7 @@ inherit packagegroup PROVIDES = "${PACKAGES}" PACKAGES = " \ ${PN}-chassis \ + ${PN}-extras \ ${PN}-fans \ ${PN}-flash \ ${PN}-system \ @@ -26,6 +27,9 @@ RDEPENDS_${PN}-chassis = " \ x86-power-control \ " +SUMMARY_${PN}-extras_tiogapass = "Extra features for tiogapass" +RDEPENDS_${PN}-extras_tiogapass = "phosphor-nvme" + SUMMARY_${PN}-fans = "Facebook Fans" RDEPENDS_${PN}-fans = " \ phosphor-pid-control \ @@ -48,5 +52,4 @@ RDEPENDS_${PN}-system = " \ ipmitool \ phosphor-post-code-manager \ phosphor-host-postd \ - phosphor-nvme \ " diff --git a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend index ab61422cb..f0a1c7be8 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-facebook/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,7 +1,16 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" OBMC_CONSOLE_HOST_TTY = "ttyS2" -SRC_URI += "file://*.conf" +SRC_URI_append_tiogapass = " file://server.ttyS2.conf" +SRC_URI_append_yosemitev2 = " file://server.ttyS0.conf \ + file://server.ttyS1.conf \ + file://server.ttyS2.conf \ + file://server.ttyS3.conf \ + file://client.2200.conf \ + file://client.2201.conf \ + file://client.2202.conf \ + file://client.2203.conf" + SRC_URI_remove = "file://${BPN}.conf" SYSTEMD_SERVICE_${PN}_remove_yosemitev2 = "obmc-console-ssh.socket" diff --git a/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh index fd1c52b2a..fd1c52b2a 100755 --- a/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh +++ b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/bios-update.sh diff --git a/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service index 7e098908e..7e098908e 100644 --- a/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service +++ b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager/obmc-flash-host-bios@.service diff --git a/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index b2160acde..2d0363286 100644 --- a/meta-facebook/meta-facebook/meta-tiogapass/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-facebook/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend_tiogapass := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://bios-update.sh" PACKAGECONFIG_append = " flash_bios" RDEPENDS_${PN} += "bash" -do_install_append_tiogapass() { +do_install_append() { install -d ${D}/${sbindir} install -m 0755 ${WORKDIR}/bios-update.sh ${D}/${sbindir}/ } diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control/tiogapass/chassis-system-reset.service b/meta-facebook/recipes-x86/chassis/x86-power-control/tiogapass/chassis-system-reset.service new file mode 100644 index 000000000..42d193692 --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control/tiogapass/chassis-system-reset.service @@ -0,0 +1,10 @@ +[Unit] +Description=System unit to hard reset or system reset chassis + +[Service] +Type=oneshot +RemainAfterExit=no +ExecStart=i2cset -y 7 0x45 0xd9 c + +[Install] +WantedBy=chassis-system-reset.target diff --git a/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend new file mode 100644 index 000000000..aa99b7e8d --- /dev/null +++ b/meta-facebook/recipes-x86/chassis/x86-power-control_%.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +EXTRA_OECMAKE += "-DCHASSIS_SYSTEM_RESET=ON" |