boot/riscv-pk: Remove obselete bootloader
diff mbox series

Message ID 20190919212648.4476-1-alistair.francis@wdc.com
State Changes Requested
Headers show
Series
  • boot/riscv-pk: Remove obselete bootloader
Related show

Commit Message

Alistair Francis Sept. 19, 2019, 9:26 p.m. UTC
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 <alistair.francis@wdc.com>
---
 boot/Config.in            |  1 -
 boot/riscv-pk/Config.in   | 17 -----------------
 boot/riscv-pk/riscv-pk.mk | 32 --------------------------------
 3 files changed, 50 deletions(-)
 delete mode 100644 boot/riscv-pk/Config.in
 delete mode 100644 boot/riscv-pk/riscv-pk.mk

Comments

Arnout Vandecappelle Sept. 21, 2019, 9:39 a.m. UTC | #1
Hi Alistair,

On 19/09/2019 23:26, Alistair Francis wrote:
> 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 <alistair.francis@wdc.com>
> ---
>  boot/Config.in            |  1 -
>  boot/riscv-pk/Config.in   | 17 -----------------
>  boot/riscv-pk/riscv-pk.mk | 32 --------------------------------
>  3 files changed, 50 deletions(-)
>  delete mode 100644 boot/riscv-pk/Config.in
>  delete mode 100644 boot/riscv-pk/riscv-pk.mk

 You missed two things:

- a Config.in.legacy entry should be added, with a help text that explains to
use OpenSBI instead. Normally we add a 'select' to do that automatically, but
I'm not sure i that is appropriate here (since you need to set the platform and
possibly the linux payload option).

- Remove the package from DEVELOPERS as well.


 Regards,
 Arnout
Alistair Francis Sept. 23, 2019, 8:07 p.m. UTC | #2
On Sat, Sep 21, 2019 at 2:40 AM Arnout Vandecappelle <arnout@mind.be> wrote:
>
>  Hi Alistair,
>
> On 19/09/2019 23:26, Alistair Francis wrote:
> > 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 <alistair.francis@wdc.com>
> > ---
> >  boot/Config.in            |  1 -
> >  boot/riscv-pk/Config.in   | 17 -----------------
> >  boot/riscv-pk/riscv-pk.mk | 32 --------------------------------
> >  3 files changed, 50 deletions(-)
> >  delete mode 100644 boot/riscv-pk/Config.in
> >  delete mode 100644 boot/riscv-pk/riscv-pk.mk
>
>  You missed two things:
>
> - a Config.in.legacy entry should be added, with a help text that explains to
> use OpenSBI instead. Normally we add a 'select' to do that automatically, but
> I'm not sure i that is appropriate here (since you need to set the platform and
> possibly the linux payload option).

Ah, I didn't know about this. I have sent a v2 with this added.

>
> - Remove the package from DEVELOPERS as well.

I have also fixed this in the v2.

Alistair

>
>
>  Regards,
>  Arnout
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Patch
diff mbox series

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))