[U-Boot] [PATCH v4 014/100] Revert "RFC: sandbox: net: Suppress the MAC-address warnings"
Simon Glass
sjg at chromium.org
Fri Nov 22 04:17:39 UTC 2019
This reverts commit 96ac4def8b6686de8566b91419ce98cd5765079b.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
Changes in v4: None
Changes in v3: None
Changes in v2: None
arch/sandbox/cpu/state.c | 12 ++----------
arch/sandbox/include/asm/state.h | 5 +----
cmd/nvedit.c | 8 --------
include/configs/sandbox.h | 7 +++++--
include/env.h | 12 ------------
net/eth-uclass.c | 11 ++---------
test/dm/test-main.c | 2 +-
7 files changed, 11 insertions(+), 46 deletions(-)
diff --git a/arch/sandbox/cpu/state.c b/arch/sandbox/cpu/state.c
index 70b278e4e2..dee5fde4f7 100644
--- a/arch/sandbox/cpu/state.c
+++ b/arch/sandbox/cpu/state.c
@@ -351,7 +351,7 @@ bool state_get_skip_delays(void)
return state->skip_delays;
}
-void state_reset_for_test(struct sandbox_state *state, bool eth_vars)
+void state_reset_for_test(struct sandbox_state *state)
{
/* No reset yet, so mark it as such. Always allow power reset */
state->last_sysreset = SYSRESET_COUNT;
@@ -367,14 +367,6 @@ void state_reset_for_test(struct sandbox_state *state, bool eth_vars)
*/
INIT_LIST_HEAD(&state->mapmem_head);
state->next_tag = state->ram_size;
-
- if (eth_vars) {
- /* set up some environment variables needed by the eth tests */
- env_set_for_test("ethaddr", "00:00:11:22:33:44");
- env_set_for_test("eth1addr", "00:00:11:22:33:45");
- env_set_for_test("eth3addr", "00:00:11:22:33:46");
- env_set_for_test("eth5addr", "00:00:11:22:33:47");
- }
}
int state_init(void)
@@ -385,7 +377,7 @@ int state_init(void)
state->ram_buf = os_malloc(state->ram_size);
assert(state->ram_buf);
- state_reset_for_test(state, false);
+ state_reset_for_test(state);
/*
* Example of how to use GPIOs:
*
diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h
index 4fa3b094a9..ad3e94beb9 100644
--- a/arch/sandbox/include/asm/state.h
+++ b/arch/sandbox/include/asm/state.h
@@ -251,11 +251,8 @@ bool state_get_skip_delays(void);
* state_reset_for_test() - Reset ready to re-run tests
*
* This clears out any test state ready for another test run.
- *
- * @param state Sandbox state to update
- * @param eth_vars Set environment variables for eth tests
*/
-void state_reset_for_test(struct sandbox_state *state, bool eth_vars);
+void state_reset_for_test(struct sandbox_state *state);
/**
* state_show() - Show information about the sandbox state
diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 6a01d755bb..99a3bc57b1 100644
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -299,14 +299,6 @@ static int _do_env_set(int flag, int argc, char * const argv[], int env_flag)
return 0;
}
-int env_set_for_test(const char *varname, const char *value)
-{
- const char * const argv[4] = { "setenv", varname, value, NULL };
-
- assert(value);
- return _do_env_set(0, 3, (char * const *)argv, 0);
-}
-
int env_set(const char *varname, const char *varvalue)
{
const char * const argv[4] = { "setenv", varname, varvalue, NULL };
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 02e553c4b1..5d75021ed6 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -98,8 +98,11 @@
"stderr=serial,vidconsole\0"
#endif
-/* Note that some ethernet variables are set in state_reset_for_test() */
-#define SANDBOX_ETH_SETTINGS "ipaddr=1.2.3.4\0"
+#define SANDBOX_ETH_SETTINGS "ethaddr=00:00:11:22:33:44\0" \
+ "eth1addr=00:00:11:22:33:45\0" \
+ "eth3addr=00:00:11:22:33:46\0" \
+ "eth5addr=00:00:11:22:33:47\0" \
+ "ipaddr=1.2.3.4\0"
#define MEM_LAYOUT_ENV_SETTINGS \
"bootm_size=0x10000000\0" \
diff --git a/include/env.h b/include/env.h
index bc48a72cde..b72239f6a5 100644
--- a/include/env.h
+++ b/include/env.h
@@ -145,18 +145,6 @@ int env_get_yesno(const char *var);
*/
int env_set(const char *varname, const char *value);
-/**
- * env_set_for_test() - Set the value of a variable for testing
- *
- * This works as if the variable value was defined in the built-in environment,
- * so uses a flags value of 0. This should only be used in tests.
- *
- * @varname: Variable to adjust
- * @value: Value to set for the variable (cannot be NULL)
- * @return 0 if OK, 1 on error
- */
-int env_set_for_test(const char *varname, const char *value);
-
/**
* env_get_ulong() - Return an environment variable as an integer value
*
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
index 6c19536138..3bd98b01ad 100644
--- a/net/eth-uclass.c
+++ b/net/eth-uclass.c
@@ -485,12 +485,6 @@ static int eth_post_probe(struct udevice *dev)
struct eth_device_priv *priv = dev->uclass_priv;
struct eth_pdata *pdata = dev->platdata;
unsigned char env_enetaddr[ARP_HLEN];
- /*
- * These warnings always appear on sandbox and are not useful. They have
- * been here for some time and the issue has not been resolved. So for
- * now, disable them.
- */
- bool show_warnings = !IS_ENABLED(CONFIG_SANDBOX);
#if defined(CONFIG_NEEDS_MANUAL_RELOC)
struct eth_ops *ops = eth_get_ops(dev);
@@ -544,9 +538,8 @@ static int eth_post_probe(struct udevice *dev)
memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN);
} else if (is_valid_ethaddr(pdata->enetaddr)) {
eth_env_set_enetaddr_by_index("eth", dev->seq, pdata->enetaddr);
- if (show_warnings)
- printf("\nWarning: %s using MAC address from ROM\n",
- dev->name);
+ printf("\nWarning: %s using MAC address from ROM\n",
+ dev->name);
} else if (is_zero_ethaddr(pdata->enetaddr) ||
!is_valid_ethaddr(pdata->enetaddr)) {
#ifdef CONFIG_NET_RANDOM_ETHADDR
diff --git a/test/dm/test-main.c b/test/dm/test-main.c
index 14a520944e..72648162a9 100644
--- a/test/dm/test-main.c
+++ b/test/dm/test-main.c
@@ -28,7 +28,7 @@ static int dm_test_init(struct unit_test_state *uts, bool of_live)
memset(dms, '\0', sizeof(*dms));
gd->dm_root = NULL;
memset(dm_testdrv_op_count, '\0', sizeof(dm_testdrv_op_count));
- state_reset_for_test(state_get_current(), true);
+ state_reset_for_test(state_get_current());
#ifdef CONFIG_OF_LIVE
/* Determine whether to make the live tree available */
--
2.24.0.432.g9d3f5f5b63-goog
More information about the U-Boot
mailing list