Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-16 14:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

sandbox: Allow SPI flash bootdevs to be disabled for tests

Browse source 
Most tests don't want these and they can create a lot of noise. Add a way
to disable them. Use that in tests, with a flag provided to enable them
for tests that need this feature.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-01-17 10:48:02 -07:00 • committed by Tom Rini
parent 22061d3d2a
commit 081bdc52c1
5 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/sandbox/cpu/state.c
View file

@ -460,6 +460,20 @@ bool sandbox_eth_enabled(void)
return !state->disable_eth;
}
void sandbox_sf_set_enable_bootdevs(bool enable)
{
struct sandbox_state *state = state_get_current();
state->disable_sf_bootdevs = !enable;
}
bool sandbox_sf_bootdev_enabled(void)
{
struct sandbox_state *state = state_get_current();
return !state->disable_sf_bootdevs;
}
int state_init(void)
{
state = &main_state;

1
arch/sandbox/include/asm/state.h
View file

@ -97,6 +97,7 @@ struct sandbox_state {
bool handle_signals; /* Handle signals within sandbox */
bool autoboot_keyed; /* Use keyed-autoboot feature */
bool disable_eth; /* Disable Ethernet devices */
bool disable_sf_bootdevs; /* Don't bind SPI flash bootdevs */
/* Pointer to information for each SPI bus/cs */
struct sandbox_spi_info spi[CONFIG_SANDBOX_SPI_MAX_BUS]

14
arch/sandbox/include/asm/test.h
View file

@ -360,4 +360,18 @@ void sandbox_set_eth_enable(bool enable);
*/
bool sandbox_eth_enabled(void);
/**
* sandbox_sf_bootdev_enabled() - Check if SPI flash bootdevs should be bound
*
* Returns: true if sandbox should bind bootdevs for SPI flash, false if not
*/
bool sandbox_sf_bootdev_enabled(void);
/**
* sandbox_sf_set_enable_bootdevs() - Enable / disable the SPI flash bootdevs
*
* @enable: true to bind the SPI flash bootdevs, false to skip
*/
void sandbox_sf_set_enable_bootdevs(bool enable);
#endif

19
include/test/test.h
View file

@ -72,6 +72,7 @@ enum {
*/
UT_TESTF_MANUAL = BIT(8),
UT_TESTF_ETH_BOOTDEV = BIT(9), /* enable Ethernet bootdevs */
UT_TESTF_SF_BOOTDEV = BIT(10), /* enable SPI flash bootdevs */
};
/**
@ -222,4 +223,22 @@ static inline bool test_eth_bootdev_enabled(void)
return enabled;
}
/* Allow SPI flash bootdev to be ignored for testing purposes */
static inline bool test_sf_bootdev_enabled(void)
{
bool enabled = true;
#ifdef CONFIG_SANDBOX
enabled = sandbox_sf_bootdev_enabled();
#endif
return enabled;
}
static inline void test_sf_set_enable_bootdevs(bool enable)
{
#ifdef CONFIG_SANDBOX
sandbox_sf_set_enable_bootdevs(enable);
#endif
}
#endif /* __TEST_TEST_H */

1
test/test-main.c
View file

@ -309,6 +309,7 @@ static int test_pre_run(struct unit_test_state *uts, struct unit_test *test)
* only set this if we know the ethernet uclass will be created
*/
eth_set_enable_bootdevs(test->flags & UT_TESTF_ETH_BOOTDEV);
test_sf_set_enable_bootdevs(test->flags & UT_TESTF_SF_BOOTDEV);
ut_assertok(dm_extended_scan(false));
}