From patchwork Tue Oct 8 16:32:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1173424 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="DvWFAr7f"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46njg86dvXz9sN1 for ; Wed, 9 Oct 2019 03:37:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0596C87F0C; Tue, 8 Oct 2019 16:37:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z0NfpZsXqCeE; Tue, 8 Oct 2019 16:37:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 8337786FB0; Tue, 8 Oct 2019 16:37:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 148E81BF3F4 for ; Tue, 8 Oct 2019 16:37:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 109A486E21 for ; Tue, 8 Oct 2019 16:37:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id US8Ofu+dan8H for ; Tue, 8 Oct 2019 16:37:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from esa4.hgst.iphmx.com (esa4.hgst.iphmx.com [216.71.154.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id 2F425869BF for ; Tue, 8 Oct 2019 16:37:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1570552619; x=1602088619; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=9C+JePXjdbcKxegochLDuCd04CHZMbtVDDuohcE5avU=; b=DvWFAr7ficz/7SrFNEGpfJdc7KSTqTZuZTdfmBptDkEHkmlG0nqcof3k uT4c+muarKqz01AcIZFq4vujPv2tuvculCx7gr3gIW9x1/wdKgWsBvh4D eCmMZ1cc4RinO0RyyHiaGlH3wrZAXYcLQeepxowbOyhKwaSwL+ml3uMB3 J0m5XYCvVCDu2cOK2Sx9LoqzoaI5NnZacCEQS08X9PYVDxjLw8O+7D1X5 TrxbViaJJkoMM318Pf3VbLUu+vHcIcwksIOyMUX9IlfT030Jiqdkrj5/A WIIunOYxZI23447dZjFFEKlhXUsaaVpREZKB5b3H4iTEDCAOBjhnH8r5s w==; IronPort-SDR: XrZ+BIhGclY80NkXbkW4s6+DgVQB3/onOlGdSA3Ij4dAsh65JU4Difpfn8fKFoKE76WwDZeGRJ 5Yh9nPrn8nSkIrmb9jC5crfjJLqCsibyKMt/6yt1YR485vsUgLd48xA7dmRFzicYnj22nisUTN O0W2CJA5V2kL+vEy+c+YcAxLc25Bb74EUtUSIl6XveaQ/8fBUgwjOWAceV12ztdxfVFmwEDmJb 62AdqkrwBrNDK53ta8n8ujNAo43dNuI8hT46wonkjMef3cPwN6I90JfB0jpIxeHsDkFOo1VMxl HLY= X-IronPort-AV: E=Sophos;i="5.67,270,1566835200"; d="scan'208";a="120048191" Received: from uls-op-cesaip02.wdc.com (HELO uls-op-cesaep02.wdc.com) ([199.255.45.15]) by ob1.hgst.iphmx.com with ESMTP; 09 Oct 2019 00:36:50 +0800 IronPort-SDR: 3AI0/6V3CtNp5wZG+AsWMCaxBZsnUYh8gEwpcs2eU8eEGhRuFBPedOmJX/TCt6TRxzTRdUZIw5 FdO09+Az90J8VoW9HHEilBeodvyYsRfl1IuP6K0a6wU5r4oRF6GbVHzIXLTbCDu4QgWPTB/dxc JtJrlHINyN/0GHXB8ANNhmogCiQlJJLasSoo2/qn6N2IFzrN7qkH/3uk7/OpT96oPJvBA4Gl5v gmyxI7ESENab6mBLdgbkKADSfi7joPq4E0pZ9mYpvpVjP0/SRsnKZpKtdi+xmcEXLfStZBNN4c mjwng+Mh12AKKqyK+Sbu63Dm Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep02.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2019 09:32:51 -0700 IronPort-SDR: F6sx8FVhsQgPm/yzhmH/y1+ZOUZdOeUFTeyuQ+hOa6U8kdHIW0jOCe4vfGDljsXdB34K+EZf8i chziQTfkHj99I55lBsJ2N01nyv3FF0oMDMq6GzmgQdbx0lubzT/nVH2s8R4c4QDu1hYqO7Yevg MkXckOX86n8n7LpMJoAJtyQ/swwMO2GF8VloMpXOloZ5/E/w3P8rRmD9LcFIrcHnFlkD98DvSj mB2XMGRE2NMlfAPgtbVolr/1fUoB1sPnUzhjrU/rM1eSi3kjNLfssn8QeJ29+ChAgrcpjOIKyn Z/A= WDCIronportException: Internal Received: from risc6-mainframe.sdcorp.global.sandisk.com (HELO risc6-mainframe.int.fusionio.com) ([10.196.157.58]) by uls-op-cesaip01.wdc.com with ESMTP; 08 Oct 2019 09:36:50 -0700 From: Alistair Francis To: buildroot@buildroot.org Date: Tue, 8 Oct 2019 09:32:19 -0700 Message-Id: <20191008163219.13477-1-alistair.francis@wdc.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3] boot/riscv-pk: Remove obselete bootloader X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alistair23@gmail.com, mark.corbin@embecosm.com, Alistair Francis Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The RISCV Proxy Kernel (AKA BBL) isn't being used by most distros so has very limited testing. It has been replaced by OpenSBI and been deprecated for awhile, so let's just remove it. Signed-off-by: Alistair Francis --- v3: - Fix indentation in Config.in.legacy - Rebase on master v2: - Remove package from DEVELOPERS - Add option to Config.in.legacy Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - boot/Config.in | 1 - boot/riscv-pk/Config.in | 17 ----------------- boot/riscv-pk/riscv-pk.mk | 32 -------------------------------- 5 files changed, 7 insertions(+), 51 deletions(-) delete mode 100644 boot/riscv-pk/Config.in delete mode 100644 boot/riscv-pk/riscv-pk.mk diff --git a/Config.in.legacy b/Config.in.legacy index 4a670f0f0e..f97872258e 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2019.11" +config BR2_TARGET_RISCV_PK + bool "riscv-pk was removed" + select BR2_LEGACY + help + The RISC-V Proxy Kernel (pk) and Berkley Boot Loader (BBL) have + been replaced with OpenSBI. + config BR2_PACKAGE_SQLITE_STAT3 bool "sqlite stat3 support was removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index f815ef3561..3fa3654d03 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1474,7 +1474,6 @@ F: arch/arch.mk.riscv F: arch/Config.in.riscv F: board/qemu/riscv32-virt/ F: board/qemu/riscv64-virt/ -F: boot/riscv-pk/ F: configs/qemu_riscv32_virt_defconfig F: configs/qemu_riscv64_virt_defconfig diff --git a/boot/Config.in b/boot/Config.in index ac1a997f00..b3adbfc8bc 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -15,7 +15,6 @@ source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" source "boot/optee-os/Config.in" source "boot/opensbi/Config.in" -source "boot/riscv-pk/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" diff --git a/boot/riscv-pk/Config.in b/boot/riscv-pk/Config.in deleted file mode 100644 index cf9c5cd8ee..0000000000 --- a/boot/riscv-pk/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -comment "riscv-pk needs a Linux kernel to be built" - depends on BR2_riscv - depends on !BR2_LINUX_KERNEL - -config BR2_TARGET_RISCV_PK - bool "riscv-pk (deprecated)" - depends on BR2_riscv - depends on BR2_LINUX_KERNEL - help - The RISC-V Proxy Kernel (pk) and Boot Loader (BBL) have - been deprecated. Please use OpenSBI instead. - - The RISC-V Proxy Kernel (pk) package contains the Berkeley - Boot Loader (BBL) which has been designed to boot a Linux - kernel on a RISC-V processor. - - https://github.com/riscv/riscv-pk.git diff --git a/boot/riscv-pk/riscv-pk.mk b/boot/riscv-pk/riscv-pk.mk deleted file mode 100644 index 0ab5879ee4..0000000000 --- a/boot/riscv-pk/riscv-pk.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# riscv-pk -# -################################################################################ - -RISCV_PK_VERSION = 706cc77c369fd3e4734b5a6aa813d421347f1814 -RISCV_PK_SITE = git://github.com/riscv/riscv-pk.git -RISCV_PK_LICENSE = BSD-3-Clause -RISCV_PK_LICENSE_FILES = LICENSE -RISCV_PK_DEPENDENCIES = linux -RISCV_PK_SUBDIR = build -RISCV_PK_INSTALL_IMAGES = YES - -define RISCV_PK_CONFIGURE_CMDS - mkdir -p $(@D)/build - (cd $(@D)/build; \ - $(TARGET_CONFIGURE_OPTS) ../configure \ - --host=$(GNU_TARGET_NAME) \ - --with-payload=$(BINARIES_DIR)/vmlinux \ - ) -endef - -define RISCV_PK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build bbl -endef - -define RISCV_PK_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0755 $(@D)/build/bbl $(BINARIES_DIR)/bbl -endef - -$(eval $(generic-package))