Message ID | 20190902081034.2893-1-xypron.glpk@gmx.de |
---|---|
State | Accepted |
Commit | cccc05ee3b9f575b567437d4146af0dee40c68ba |
Delegated to: | Joe Hershberger |
Headers | show |
Series | [U-Boot,1/1] env: net: U_BOOT_ENV_CALLBACKs should not depend on CMD_NET | expand |
Hi Heinrich, On Mon, Sep 2, 2019 at 3:11 AM Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > > Some environment variables are relevant for networking. For these > U_BOOT_ENV_CALLBACKs have been defined. When the corresponding environment > variable is updated the callback updates the state of the network > sub-system. > > In the UEFI subsystem we can use the network even if CONFIG_CMD_NET is not > defined. > > Let the usage of the U_BOOT_ENV_CALLBACKs depend on CONFIG_NET and not on > CONFIG_CMD_NET. > > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Hi Heinrich, https://patchwork.ozlabs.org/patch/1156517/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git Thanks! -Joe
diff --git a/include/env_callback.h b/include/env_callback.h index 982c07854d..74da20eec3 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -42,7 +42,7 @@ #define DNS_CALLBACK #endif -#ifdef CONFIG_CMD_NET +#ifdef CONFIG_NET #define NET_CALLBACKS \ "bootfile:bootfile," \ "ipaddr:ipaddr," \ diff --git a/include/env_flags.h b/include/env_flags.h index e5380f2948..725841a891 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -36,7 +36,7 @@ enum env_flags_varaccess { #define CONFIG_ENV_FLAGS_LIST_STATIC "" #endif -#ifdef CONFIG_CMD_NET +#ifdef CONFIG_NET #ifdef CONFIG_REGEX #define ETHADDR_WILDCARD "\\d*" #else
Some environment variables are relevant for networking. For these U_BOOT_ENV_CALLBACKs have been defined. When the corresponding environment variable is updated the callback updates the state of the network sub-system. In the UEFI subsystem we can use the network even if CONFIG_CMD_NET is not defined. Let the usage of the U_BOOT_ENV_CALLBACKs depend on CONFIG_NET and not on CONFIG_CMD_NET. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- Travis CI tested: https://travis-ci.org/xypron2/u-boot/builds/579439014 --- include/env_callback.h | 2 +- include/env_flags.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1