Initial modifications for Blackbird

10 files changed, 196 insertions, 8 deletions

diff --git a/README.md b/README.md
index 2705a166..633fd596 100644
--- a/README.md
+++ b/README.md
@@ -24,12 +24,12 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for howto contribute code.
 
 ## Building an image
 
-To build an image for a Talos system:
+To build an image for a Blackbird system:
 
 ```
 git clone --recursive git@github.com:open-power/op-build.git
 cd op-build
-./op-build talos_defconfig && ./op-build
+./op-build blackbird_defconfig && ./op-build
 ```
 
 There are also default configurations for other platforms in
diff --git a/openpower/configs/blackbird_defconfig b/openpower/configs/blackbird_defconfig
new file mode 100644
index 00000000..f5b7e278
--- /dev/null
+++ b/openpower/configs/blackbird_defconfig
@@ -0,0 +1,68 @@
+BR2_powerpc64le=y
+BR2_powerpc_power8=y
+BR2_GCC_VERSION_6_X=y
+BR2_BINUTILS_EXTRA_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--enable-targets=powerpc64-linux"
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TARGET_GENERIC_HOSTNAME="skiroot"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_DEVICE_TABLE="../openpower/device_table.txt"
+BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
+BR2_ENABLE_LOCALE_WHITELIST="C de en es fr it ja ko pt_BR ru zh_CN zh_TW"
+BR2_GENERATE_LOCALE="en_US.UTF-8 de_DE.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 it_IT.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 ru_RU.UTF-8 zh_CN.UTF-8 zh_TW.UTF-8"
+BR2_SYSTEM_ENABLE_NLS=y
+BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/users-table"
+BR2_ROOTFS_OVERLAY="../openpower/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist ../openpower/scripts/blackbird-extra-cleanup"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://scm.raptorcs.com/scm/git/blackbird-op-linux"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.19"
+BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
+BR2_LINUX_KERNEL_ZIMAGE_EPAPR=y
+# BR2_KERNEL_HEADERS_5_0 is not set
+BR2_KERNEL_HEADERS_4_19=y
+BR2_LINUX_KERNEL_XZ=y
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/busybox.fragment"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_IPMITOOL=y
+BR2_PACKAGE_IPMITOOL_USB=y
+BR2_PACKAGE_MDADM=y
+BR2_PACKAGE_NCURSES_WCHAR=y
+BR2_PACKAGE_DROPBEAR=y
+# BR2_PACKAGE_DROPBEAR_SERVER is not set
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_LRZSZ=y
+BR2_PACKAGE_NETCAT=y
+BR2_PACKAGE_RSYNC=y
+BR2_PACKAGE_SUDO=y
+BR2_PACKAGE_UTIL_LINUX_AGETTY=y
+BR2_PACKAGE_PNV_LPC=y
+BR2_TARGET_ROOTFS_CPIO_XZ=y
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_OPENPOWER_PLATFORM=y
+BR2_OPENPOWER_POWER9=y
+BR2_HOSTBOOT_CONFIG_FILE="blackbird.config"
+BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="blackbird-xml"
+BR2_OPENPOWER_MACHINE_XML_VERSION="04b4c2765f06c77b7d9e0cb0e0d5092471e4d416"
+BR2_OPENPOWER_MACHINE_XML_FILENAME="blackbird.xml"
+BR2_OPENPOWER_SYSTEM_XML_FILENAME="BLACKBIRD_hb.system.xml"
+BR2_OPENPOWER_MRW_XML_FILENAME="BLACKBIRD_hb.mrw.xml"
+BR2_OPENPOWER_BIOS_XML_FILENAME="BLACKBIRD_bios.xml"
+BR2_OPENPOWER_PNOR_XML_LAYOUT_FILENAME="defaultPnorLayout_64.xml"
+BR2_OPENPOWER_CONFIG_NAME="blackbird"
+BR2_OPENPOWER_PNOR_FILENAME="blackbird.pnor"
+BR2_HOSTBOOT_BINARY_SBE_FILENAME="nimbus_sbe.img.ecc"
+BR2_HOSTBOOT_BINARY_SBEC_FILENAME="centaur_sbec_pad.img.ecc"
+BR2_HOSTBOOT_BINARY_WINK_FILENAME="p9n.ref_image.hdr.bin.ecc"
+BR2_IMA_CATALOG_FILENAME="ima_catalog.bin"
+BR2_OPENPOWER_TARGETING_BIN_FILENAME="BLACKBIRD_HB.targeting.bin"
+BR2_OPENPOWER_TARGETING_ECC_FILENAME="BLACKBIRD_HB.targeting.bin.ecc"
+BR2_PACKAGE_PETITBOOT=y
+BR2_PACKAGE_PETITBOOT_MTD=y
+BR2_OCC_BIN_FILENAME="occ.bin"
+# BR2_CAPP_UCODE_BIN_FILENAME is not set
+BR2_PACKAGE_LOADKEYS=y
+BR2_IMA_CATALOG_DTS="POWER9"
diff --git a/openpower/configs/hostboot/blackbird.config b/openpower/configs/hostboot/blackbird.config
new file mode 100755
index 00000000..7d48958c
--- /dev/null
+++ b/openpower/configs/hostboot/blackbird.config
@@ -0,0 +1,73 @@
+# The BMC MBOX Protocol is used to access PNOR
+unset SFC_IS_AST2500
+unset SFC_IS_AST2400
+set   PNORDD_IS_BMCMBOX
+unset PNORDD_IS_SFC
+unset BMC_DOES_SFC_INIT
+unset SFC_IS_IBM_DPSS
+set   ALLOW_MICRON_PNOR
+set   ALLOW_MACRONIX_PNOR
+
+# VPD options.
+set MVPD_READ_FROM_HW
+set MVPD_WRITE_TO_HW
+set MVPD_READ_FROM_PNOR
+set MVPD_WRITE_TO_PNOR
+set DJVPD_READ_FROM_HW
+unset DJVPD_WRITE_TO_HW
+set DJVPD_READ_FROM_PNOR
+set DJVPD_WRITE_TO_PNOR
+set MEMVPD_READ_FROM_HW
+set MEMVPD_WRITE_TO_HW
+set MEMVPD_READ_FROM_PNOR
+set MEMVPD_WRITE_TO_PNOR
+set PVPD_READ_FROM_HW
+set PVPD_WRITE_TO_HW
+set PVPD_READ_FROM_PNOR
+set PVPD_WRITE_TO_PNOR
+unset CDIMM_FORMAT_FOR_CVPD
+
+# gpio config
+set GPIODD
+unset PALMETTO_VDDR
+
+# Enable Consecutive SBE Updates
+set   SBE_UPDATE_CONSECUTIVE
+unset SBE_UPDATE_INDEPENDENT
+unset SBE_UPDATE_SEQUENTIAL
+unset SBE_UPDATE_SIMULTANEOUS
+unset NO_SBE_UPDATES
+
+unset PCIE_HOTPLUG_CONTROLLER
+
+# turn on console output
+set CONSOLE
+set BMC_AST2500
+
+unset DISABLE_HOSTBOOT_RUNTIME
+
+# Compile in hostboot runtime PRD
+set HBRT_PRD
+set HTMGT
+set START_OCC_DURING_BOOT
+unset CONSOLE_OUTPUT_OCC_COMM
+
+#PNOR flags
+unset PNOR_TWO_SIDE_SUPPORT
+
+set BMC_BT_LPC_IPMI
+
+# Required to reliably boot a dual CPU system
+set ISTEP_LPC_PORT8X_DEBUG
+
+# Enable Checktop Analysis
+set ENABLE_CHECKSTOP_ANALYSIS
+set IPLTIME_CHECKSTOP_ANALYSIS
+
+# set for trace debug to console
+unset CONSOLE_OUTPUT_TRACE
+set CONSOLE_OUTPUT_FFDCDISPLAY
+
+unset SECUREBOOT
+unset TPMDD
+unset TPM_NUVOTON
diff --git a/openpower/linux/0006-Force-ASpeed-DVO-enable.patch b/openpower/linux/0006-Force-ASpeed-DVO-enable.patch
new file mode 100644
index 00000000..01673136
--- /dev/null
+++ b/openpower/linux/0006-Force-ASpeed-DVO-enable.patch
@@ -0,0 +1,28 @@
+diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c
+index 2854399856ba..c22206b6bc85 100644
+--- a/drivers/gpu/drm/ast/ast_main.c
++++ b/drivers/gpu/drm/ast/ast_main.c
+@@ -210,18 +210,12 @@ static int ast_detect_chip(struct drm_device *dev, bool *need_post)
+ 	ast->tx_chip_type = AST_TX_NONE;
+ 
+ 	/*
+-	 * VGACRA3 Enhanced Color Mode Register, check if DVO is already
+-	 * enabled, in that case, assume we have a SIL164 TMDS transmitter
+-	 *
+-	 * Don't make that assumption if we the chip wasn't enabled and
+-	 * is at power-on reset, otherwise we'll incorrectly "detect" a
+-	 * SIL164 when there is none.
++	 * VGACRA3 Enhanced Color Mode Register, unconditionally enable
++	 * DVO output on Blackbird systems and set SIL164 chip type as
++	 * interim solution pending proper ITE driver.
+ 	 */
+-	if (!*need_post) {
+-		jreg = ast_get_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa3, 0xff);
+-		if (jreg & 0x80)
+-			ast->tx_chip_type = AST_TX_SIL164;
+-	}
++	ast_set_index_reg_mask(ast, AST_IO_CRTC_PORT, 0xa3, 0xff, 0x80);
++	ast->tx_chip_type = AST_TX_SIL164;
+ 
+ 	if ((ast->chip == AST2300) || (ast->chip == AST2400)) {
+ 		/*
diff --git a/openpower/package/libflash/libflash.mk b/openpower/package/libflash/libflash.mk
index 25fd0e12..122b3082 100644
--- a/openpower/package/libflash/libflash.mk
+++ b/openpower/package/libflash/libflash.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBFLASH_VERSION = 9858186353f2203fe477f316964e03609d12fd1d
-LIBFLASH_SITE = https://scm.raptorcs.com/scm/git/talos-skiboot
+LIBFLASH_VERSION = c81f9d66592dc2a7cf7f6c59c3def5cee0638c1f
+LIBFLASH_SITE = https://scm.raptorcs.com/scm/git/blackbird-skiboot
 LIBFLASH_SITE_METHOD = git
 
 LIBFLASH_INSTALL_STAGING = YES
diff --git a/openpower/package/machine-xml/machine-xml.mk b/openpower/package/machine-xml/machine-xml.mk
index 99974b18..f789fbde 100644
--- a/openpower/package/machine-xml/machine-xml.mk
+++ b/openpower/package/machine-xml/machine-xml.mk
@@ -4,7 +4,7 @@
 ################################################################################
 
 MACHINE_XML_VERSION ?= $(call qstrip,$(BR2_OPENPOWER_MACHINE_XML_VERSION))
-MACHINE_XML_SITE = https://scm.raptorcs.com/scm/git/talos-xml
+MACHINE_XML_SITE = https://scm.raptorcs.com/scm/git/blackbird-xml
 MACHINE_XML_SITE_METHOD = git
 
 MACHINE_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/pnv-lpc/pnv-lpc.mk b/openpower/package/pnv-lpc/pnv-lpc.mk
index d9dacab7..1bdc12fd 100644
--- a/openpower/package/pnv-lpc/pnv-lpc.mk
+++ b/openpower/package/pnv-lpc/pnv-lpc.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 PNV_LPC_VERSION = 90e170cab6ff2fb1e1771972402e1d426448544c
-PNV_LPC_SITE = https://scm.raptorcs.com/scm/git/talos-skiboot
+PNV_LPC_SITE = https://scm.raptorcs.com/scm/git/blackbird-skiboot
 PNV_LPC_SITE_METHOD = git
 
 PNV_LPC_INSTALL_TARGET = YES
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index eab0bdf0..fa3da338 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@ config BR2_SKIBOOT_CUSTOM_VERSION_VALUE
 
 config BR2_SKIBOOT_VERSION
 	string
-	default "9858186353f2203fe477f316964e03609d12fd1d" if BR2_SKIBOOT_LATEST_VERSION
+	default "c81f9d66592dc2a7cf7f6c59c3def5cee0638c1f" if BR2_SKIBOOT_LATEST_VERSION
 	default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_SKIBOOT_CUSTOM_VERSION
 
diff --git a/openpower/package/skiboot/skiboot.mk b/openpower/package/skiboot/skiboot.mk
index 9a398f81..bbeb7a59 100644
--- a/openpower/package/skiboot/skiboot.mk
+++ b/openpower/package/skiboot/skiboot.mk
@@ -6,7 +6,7 @@
 
 SKIBOOT_VERSION = $(call qstrip,$(BR2_SKIBOOT_VERSION))
 
-SKIBOOT_SITE = https://scm.raptorcs.com/scm/git/talos-skiboot
+SKIBOOT_SITE = https://scm.raptorcs.com/scm/git/blackbird-skiboot
 SKIBOOT_SITE_METHOD = git
 SKIBOOT_LICENSE = Apache-2.0
 SKIBOOT_LICENSE_FILES = LICENCE
diff --git a/openpower/scripts/blackbird-extra-cleanup b/openpower/scripts/blackbird-extra-cleanup
new file mode 100755
index 00000000..cd7246d8
--- /dev/null
+++ b/openpower/scripts/blackbird-extra-cleanup
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Extra cleanup tasks to trim some extra fat from the target.
+
+# If $TARGET_DIR is not set, bail immediately.
+if [ -z "$TARGET_DIR" ]; then
+	exit 1
+fi
+
+# libstdc++ is not used by any skiroot binaries.
+rm $TARGET_DIR/usr/lib/libstdc++*
+
+# libelf is needed for kexec, but no point in keeping foreign platform support.
+for n in aarch64 alpha arm i386 ia64 m68k s390 sh sparc tilegx x86_64
+do
+	rm $TARGET_DIR/usr/lib/elfutils/libebl_${n}*.so
+done
+
+exit 0