sandbox: fix a compilation error
PATCH v2 1/1 sandbox: fix a compilation error
With sandbox and sandbox64 configurations:
In file included from .../u-boot/include/test/test.h:156,
from .../u-boot/include/test/lib.h:9,
from .../u-boot/test/lib/test_crc8.c:8:
.../u-boot/arch/sandbox/include/asm/test.h: In function ‘sandbox_sdl_set_bpp’:
.../u-boot/arch/sandbox/include/asm/test.h:323:17: error: ‘ENOSYS’ undeclared (first use in this function)
323 | return -ENOSYS;
| ^~~~~~Per Tom Rini's suggestion:
move that function prototype over to arch/sandbox/include/asm/sdl.h and make test/dm/video.c include <asm/sdl.h>
---
v2:
* move the function to another file instead of including <errno.h>
arch/sandbox/include/asm/sdl.h | 23 +++++++++++++++++++++++ arch/sandbox/include/asm/test.h | 25 ------------------------- test/dm/video.c | 1 + 3 files changed, 24 insertions(+), 25 deletions(-)
arch/sandbox/include/asm/sdl.h +23 -0
@@ -7,6 +7,7 @@#define __SANDBOX_SDL_H#include <errno.h> +#include <video.h> #ifdef CONFIG_SANDBOX_SDL
@@ -87,6 +88,22 @@ int sandbox_sdl_sound_stop(void);*/ int sandbox_sdl_sound_init (int rate,int channels); +/** +* sandbox_sdl_set_bpp() - Set the depth of the sandbox display +* +* The device must not be active when this function is called. It activiates it +* before returning. +* +* This updates the depth value and adjusts a few other settings accordingly. +* It must be called before the display is probed. +* +* @dev: Device to adjust +* @l2bpp: depth to set +* Return: 0 if the device was already active, other error if it fails to probe +* after the change +*/ +int sandbox_sdl_set_bpp (struct udevice *dev,enum video_log2_bpp l2bpp); +#else static inline int sandbox_sdl_init_display (int width,int height,int log2_bpp,bool double_size)
@@ -134,6 +151,12 @@ static inline int sandbox_sdl_sound_init(int rate, int channels)return -ENODEV ; } +static inline int sandbox_sdl_set_bpp (struct udevice *dev, +enum video_log2_bpp l2bpp) +{ +return -ENOSYS ; +} +#endif #endif
arch/sandbox/include/asm/test.h +0 -25
@@ -8,7 +8,6 @@#ifndef __ASM_TEST_H#define __ASM_TEST_H -#include <video.h> #include <pci_ids.h> struct unit_test_state ;
@@ -300,30 +299,6 @@ void sandbox_cros_ec_set_test_flags(struct udevice *dev, uint flags);*/ int sandbox_cros_ec_get_pwm_duty (struct udevice *dev,uint index,uint *duty); -#if IS_ENABLED (CONFIG_SANDBOX_SDL ) -/** -* sandbox_sdl_set_bpp() - Set the depth of the sandbox display -* -* The device must not be active when this function is called. It activiates it -* before returning. -* -* This updates the depth value and adjusts a few other settings accordingly. -* It must be called before the display is probed. -* -* @dev: Device to adjust -* @l2bpp: depth to set -* Return: 0 if the device was already active, other error if it fails to probe -* after the change -*/ -int sandbox_sdl_set_bpp (struct udevice *dev,enum video_log2_bpp l2bpp); -#else -static inline int sandbox_sdl_set_bpp (struct udevice *dev, -enum video_log2_bpp l2bpp) -{ -return -ENOSYS ; -} -#endif -/** * sandbox_set_fake_efi_mgr_dev() - Control EFI bootmgr producing valid bootflow *
test/dm/video.c +1 -0
@@ -15,6 +15,7 @@#include <video.h> #include <video_console.h> #include <asm/test.h> +#include <asm/sdl.h> #include <dm/test.h> #include <dm/uclass-internal.h> #include <test/test.h>
Signature · 1 line
2.37.2
Hi Sergei,
Quoted 124 lines · Sergei Antonov
With sandbox and sandbox64 configurations:
In file included from
.../u-boot/include/test/test.h:156,from .../u-boot/include/test/lib.h:9, from .../u-boot/test/lib/test_crc8.c:8: .../u-boot/arch/sandbox/include/asm/test.h: In function ‘sandbox_sdl_set_bpp’: .../u-boot/arch/sandbox/include/asm/test.h:323:17: error: ‘ENOSYS’ undeclared (first use in this function) 323 | return -ENOSYS; | ^~~~~~Per Tom Rini's suggestion:
move that function prototype over toarch/sandbox/include/asm/sdl.hand maketest/dm/video.cinclude <asm/sdl.h>Cc Simon Glass <[email protected]>Suggested-by Tom Rini <[email protected]>Signed-off-by Sergei Antonov <[email protected]>---
v2:
* move the function to another file instead of including <errno.h>arch/sandbox/include/asm/sdl.h | 23 +++++++++++++++++++++++ arch/sandbox/include/asm/test.h | 25 ------------------------- test/dm/video.c | 1 + 3 files changed, 24 insertions(+), 25 deletions(-)arch/sandbox/include/asm/sdl.h +23
-0@@ -7,6 +7,7 @@#define __SANDBOX_SDL_H#include <errno.h> +#include <video.h> #ifdef CONFIG_SANDBOX_SDL @@ -87,6 +88,22 @@ int sandbox_sdl_sound_stop(void);*/ int sandbox_sdl_sound_init (int rate,int channels); +/** +* sandbox_sdl_set_bpp() - Set the depth of the sandbox display +* +* The device must not be active when this function is called. It activiates it +* before returning. +* +* This updates the depth value and adjusts a few other settings accordingly. +* It must be called before the display is probed. +* +* @dev: Device to adjust +* @l2bpp: depth to set +* Return: 0 if the device was already active, other error if it fails to probe +* after the change +*/ +int sandbox_sdl_set_bpp (struct udevice *dev,enum video_log2_bpp l2bpp); +#else static inline int sandbox_sdl_init_display (int width,int height,int log2_bpp,bool double_size)@@ -134,6 +151,12 @@ static inline int sandbox_sdl_sound_init(int rate, int channels)return -ENODEV ; } +static inline int sandbox_sdl_set_bpp (struct udevice *dev, +enum video_log2_bpp l2bpp) +{ +return -ENOSYS ; +} +#endif #endif arch/sandbox/include/asm/test.h +0
-25@@ -8,7 +8,6 @@#ifndef __ASM_TEST_H#define __ASM_TEST_H -#include <video.h> #include <pci_ids.h> struct unit_test_state ;@@ -300,30 +299,6 @@ void sandbox_cros_ec_set_test_flags(struct udevice *dev, uint flags);*/ int sandbox_cros_ec_get_pwm_duty (struct udevice *dev,uint index,uint *duty); -#if IS_ENABLED (CONFIG_SANDBOX_SDL ) -/** -* sandbox_sdl_set_bpp() - Set the depth of the sandbox display -* -* The device must not be active when this function is called. It activiates it -* before returning. -* -* This updates the depth value and adjusts a few other settings accordingly. -* It must be called before the display is probed. -* -* @dev: Device to adjust -* @l2bpp: depth to set -* Return: 0 if the device was already active, other error if it fails to probe -* after the change -*/ -int sandbox_sdl_set_bpp (struct udevice *dev,enum video_log2_bpp l2bpp); -#else -static inline int sandbox_sdl_set_bpp (struct udevice *dev, -enum video_log2_bpp l2bpp) -{ -return -ENOSYS ; -} -#endif -/** * sandbox_set_fake_efi_mgr_dev() - Control EFI bootmgr producing valid bootflow * test/dm/video.c +0
-0
test/dm/video.c line 18
Quoted 4 lines
test/dm/video.c +1
-0@@ -15,6 +15,7 @@#include <video.h> #include <video_console.h> #include <asm/test.h> +#include <asm/sdl.h>
The problem with this is it then cannot be built on non-sandbox boards. I think v1 was OK.
Quoted 6 lines
test/dm/video.c +0
-1#include <dm/test.h> #include <dm/uclass-internal.h> #include <test/test.h> --2.37.2
Regards,
Simon
Quoted 126 lines · Simon Glass
Hi Sergei,
Quoted 123 lines · Sergei Antonov
With sandbox and sandbox64 configurations:
In file included from
.../u-boot/include/test/test.h:156,from .../u-boot/include/test/lib.h:9, from .../u-boot/test/lib/test_crc8.c:8: .../u-boot/arch/sandbox/include/asm/test.h: In function ‘sandbox_sdl_set_bpp’: .../u-boot/arch/sandbox/include/asm/test.h:323:17: error: ‘ENOSYS’ undeclared (first use in this function) 323 | return -ENOSYS; | ^~~~~~Per Tom Rini's suggestion:
move that function prototype over toarch/sandbox/include/asm/sdl.hand maketest/dm/video.cinclude <asm/sdl.h>Cc Simon Glass <[email protected]>Suggested-by Tom Rini <[email protected]>Signed-off-by Sergei Antonov <[email protected]>---
v2:
* move the function to another file instead of including <errno.h>arch/sandbox/include/asm/sdl.h | 23 +++++++++++++++++++++++ arch/sandbox/include/asm/test.h | 25 ------------------------- test/dm/video.c | 1 + 3 files changed, 24 insertions(+), 25 deletions(-)arch/sandbox/include/asm/sdl.h +23
-0@@ -7,6 +7,7 @@#define __SANDBOX_SDL_H#include <errno.h> +#include <video.h> #ifdef CONFIG_SANDBOX_SDL @@ -87,6 +88,22 @@ int sandbox_sdl_sound_stop(void);*/ int sandbox_sdl_sound_init (int rate,int channels); +/** +* sandbox_sdl_set_bpp() - Set the depth of the sandbox display +* +* The device must not be active when this function is called. It activiates it +* before returning. +* +* This updates the depth value and adjusts a few other settings accordingly. +* It must be called before the display is probed. +* +* @dev: Device to adjust +* @l2bpp: depth to set +* Return: 0 if the device was already active, other error if it fails to probe +* after the change +*/ +int sandbox_sdl_set_bpp (struct udevice *dev,enum video_log2_bpp l2bpp); +#else static inline int sandbox_sdl_init_display (int width,int height,int log2_bpp,bool double_size)@@ -134,6 +151,12 @@ static inline int sandbox_sdl_sound_init(int rate, int channels)return -ENODEV ; } +static inline int sandbox_sdl_set_bpp (struct udevice *dev, +enum video_log2_bpp l2bpp) +{ +return -ENOSYS ; +} +#endif #endif arch/sandbox/include/asm/test.h +0
-25@@ -8,7 +8,6 @@#ifndef __ASM_TEST_H#define __ASM_TEST_H -#include <video.h> #include <pci_ids.h> struct unit_test_state ;@@ -300,30 +299,6 @@ void sandbox_cros_ec_set_test_flags(struct udevice *dev, uint flags);*/ int sandbox_cros_ec_get_pwm_duty (struct udevice *dev,uint index,uint *duty); -#if IS_ENABLED (CONFIG_SANDBOX_SDL ) -/** -* sandbox_sdl_set_bpp() - Set the depth of the sandbox display -* -* The device must not be active when this function is called. It activiates it -* before returning. -* -* This updates the depth value and adjusts a few other settings accordingly. -* It must be called before the display is probed. -* -* @dev: Device to adjust -* @l2bpp: depth to set -* Return: 0 if the device was already active, other error if it fails to probe -* after the change -*/ -int sandbox_sdl_set_bpp (struct udevice *dev,enum video_log2_bpp l2bpp); -#else -static inline int sandbox_sdl_set_bpp (struct udevice *dev, -enum video_log2_bpp l2bpp) -{ -return -ENOSYS ; -} -#endif -/** * sandbox_set_fake_efi_mgr_dev() - Control EFI bootmgr producing valid bootflow * test/dm/video.c +0
-0
Quoted 8 lines
test/dm/video.c line 18
Quoted 5 lines
test/dm/video.c +1
-0@@ -15,6 +15,7 @@#include <video.h> #include <video_console.h> #include <asm/test.h> +#include <asm/sdl.h> The problem with this is it then cannot be built on non-sandbox boards. I think v1 was OK.
I suggested this since the test is sandbox specific (the code itself is full of sandbox_foo).
Signature · 1 line
Tom
Quoted 2 lines · Simon Glass
The problem with this is it then cannot be built on non-sandbox boards. I think v1 was OK.
Before the patch as well as after the patch:
if CONFIG_SANDBOX_SDL
declaration of sandbox_sdl_set_bpp()
else
definition of sandbox_sdl_set_bpp() returning error
end
This patch only moves code to another header file in arch/sandbox/include/asm. How can a non-sandbox build fail because of this patch?
Quoted 4 lines · Sergei Antonov
Quoted 2 lines · Simon Glass
The problem with this is it then cannot be built on non-sandbox boards. I think v1 was OK.
Quoted 8 lines
Before the patch as well as after the patch:
ifCONFIG_SANDBOX_SDL
declaration ofsandbox_sdl_set_bpp()
else
definition ofsandbox_sdl_set_bpp()returning error
end
This patch only moves code to another header file inarch/sandbox/include/asm. How can a non-sandbox build fail because of this patch?
Right, test/dm/video.c is for sandbox-only.
Signature · 1 line
Tom
Simon Glass
Reviewed-byHi,
Quoted 15 lines · Tom Rini
Quoted 4 lines · Sergei Antonov
Quoted 2 lines · Simon Glass
The problem with this is it then cannot be built on non-sandbox boards. I think v1 was OK.
Quoted 8 lines
Before the patch as well as after the patch:
ifCONFIG_SANDBOX_SDL
declaration ofsandbox_sdl_set_bpp()
else
definition ofsandbox_sdl_set_bpp()returning error
end
This patch only moves code to another header file inarch/sandbox/include/asm. How can a non-sandbox build fail because of this patch?
Quoted 1 line
Right,
test/dm/video.cis for sandbox-only.
OK, yes.
Regards,
Simon
Simon Glass
Reviewed-byHi,
Quoted 15 lines · Tom Rini
Quoted 4 lines · Sergei Antonov
Quoted 2 lines · Simon Glass
The problem with this is it then cannot be built on non-sandbox boards. I think v1 was OK.
Quoted 8 lines
Before the patch as well as after the patch:
ifCONFIG_SANDBOX_SDL
declaration ofsandbox_sdl_set_bpp()
else
definition ofsandbox_sdl_set_bpp()returning error
end
This patch only moves code to another header file inarch/sandbox/include/asm. How can a non-sandbox build fail because of this patch?
Quoted 1 line
Right,
test/dm/video.cis for sandbox-only.
OK, yes.
Regards,
Simon
Applied to u-boot-dm, thanks!