diff mbox

package/rpi-firmware: fix unmet dependencies

Message ID 20170506212617.27587-1-yann.morin.1998@free.fr
State Accepted
Commit f92df683609e050197ae2454d7dbf3b6e33d8036
Headers show

Commit Message

Yann E. MORIN May 6, 2017, 9:26 p.m. UTC
Currently, vcdbg is only supported in 32-bit mode. Furthermore, vcdbg
needs rpi-userland, which we currently only support in 32-bit mode.

Add a dependency on BR2_arm.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
 package/rpi-firmware/Config.in | 2 ++
 1 file changed, 2 insertions(+)

Comments

Thomas Petazzoni May 7, 2017, 7:42 p.m. UTC | #1
Hello,

On Sat,  6 May 2017 23:26:17 +0200, Yann E. MORIN wrote:
> Currently, vcdbg is only supported in 32-bit mode. Furthermore, vcdbg
> needs rpi-userland, which we currently only support in 32-bit mode.
> 
> Add a dependency on BR2_arm.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
> ---
>  package/rpi-firmware/Config.in | 2 ++
>  1 file changed, 2 insertions(+)

Applied to master, thanks.

Thomas
Peter Korsgaard May 7, 2017, 7:43 p.m. UTC | #2
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > Currently, vcdbg is only supported in 32-bit mode. Furthermore, vcdbg
 > needs rpi-userland, which we currently only support in 32-bit mode.

 > Add a dependency on BR2_arm.

 > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 > Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>

I was wondering if these were just missing when the || BR2_aarch64 logic
was added, but rpi-userland really doesn't build in 64bit mode:

/home/peko/source/buildroot/output-rpi64/build/rpi-userland-f0642e3b58d8a140a3f7621630c15fbfa794b19d/build/inc/interface/vcos/vcos_assert.h:303:69: error: size of array ‘vcos_static_assert’ is negative
 #define vcos_static_assert(cond) __attribute__((unused)) extern int vcos_static_assert[(cond)?1:-1]
                                                                     ^
/home/peko/source/buildroot/output-rpi64/build/rpi-userland-f0642e3b58d8a140a3f7621630c15fbfa794b19d/interface/khronos/common/khrn_client_check_types.h:72:1: note: in expansion of macro ‘vcos_static_assert’
 vcos_static_assert(sizeof(GLsizeiptr) == 4);

> ---
 >  package/rpi-firmware/Config.in | 2 ++
 >  1 file changed, 2 insertions(+)

 > diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in
 > index 4efef8691e..a7fa1c3b33 100644
 > --- a/package/rpi-firmware/Config.in
 > +++ b/package/rpi-firmware/Config.in
 > @@ -67,6 +67,7 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
 
 >  config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
 >  	bool "vcdbg"
 > +	depends on BR2_arm # rpi-userland
 >  	depends on BR2_TOOLCHAIN_USES_GLIBC
 >  	depends on BR2_INSTALL_LIBSTDCPP # rpi-userland
 >  	select BR2_PACKAGE_RPI_USERLAND

What is even more important than the rpi-userland dependency is the fact
that vcdgb is a prebuilt arm binary. You could argue that it perhaps
should have used 'depends on' instead of 'select' for rpi-userland, as
the dependency afaik is:

It doesn't make sense to debug the GPU communication if you don't use
the GPU driver.

Rather than any strong direct rpi-userland dependency by this binary,
but ok.

Committed after adjusting the comment, thanks.
diff mbox

Patch

diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in
index 4efef8691e..a7fa1c3b33 100644
--- a/package/rpi-firmware/Config.in
+++ b/package/rpi-firmware/Config.in
@@ -67,6 +67,7 @@  config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
 
 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
 	bool "vcdbg"
+	depends on BR2_arm # rpi-userland
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_INSTALL_LIBSTDCPP # rpi-userland
 	select BR2_PACKAGE_RPI_USERLAND
@@ -74,6 +75,7 @@  config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
 	  Install vcdbg, to help debug communication with the GPU.
 
 comment "vcdbg needs a glibc toolchain w/ C++"
+	depends on BR2_arm
 	depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP
 
 endif # BR2_PACKAGE_RPI_FIRMWARE