diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-01 08:54:12 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-02 05:47:18 +0200 |
| commit | cd2891b2949474aaf0b549ed5d697ef2143df9db (patch) | |
| tree | 21d3b59dc8db14f0ac9be8e5a947e8a4fabd3629 /net | |
| parent | a6b630f139416a05b158b6368cb9ee99738b20f4 (diff) | |
| download | barebox-cd2891b2949474aaf0b549ed5d697ef2143df9db.tar.gz barebox-cd2891b2949474aaf0b549ed5d697ef2143df9db.tar.xz | |
magicvar: Replace BAREBOX_MAGICVAR_NAMED with BAREBOX_MAGICVAR
BAREBOX_MAGICVAR now generates a unique identifier automatically,
so we can convert users of BAREBOX_MAGICVAR_NAMED to the simpler
BAREBOX_MAGICVAR macro.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dhcp.c | 20 | ||||
| -rw-r--r-- | net/fastboot.c | 5 | ||||
| -rw-r--r-- | net/ifup.c | 5 | ||||
| -rw-r--r-- | net/net.c | 6 |
4 files changed, 17 insertions, 19 deletions
diff --git a/net/dhcp.c b/net/dhcp.c index a27fa89996..e701a5f717 100644 --- a/net/dhcp.c +++ b/net/dhcp.c @@ -647,13 +647,13 @@ static int dhcp_global_init(void) late_initcall(dhcp_global_init); #endif -BAREBOX_MAGICVAR_NAMED(global_dhcp_bootfile, global.dhcp.bootfile, "bootfile returned from DHCP request"); -BAREBOX_MAGICVAR_NAMED(global_dhcp_rootpath, global.dhcp.rootpath, "rootpath returned from DHCP request"); -BAREBOX_MAGICVAR_NAMED(global_dhcp_vendor_id, global.dhcp.vendor_id, "vendor id to send to the DHCP server"); -BAREBOX_MAGICVAR_NAMED(global_dhcp_client_uuid, global.dhcp.client_uuid, "client uuid to send to the DHCP server"); -BAREBOX_MAGICVAR_NAMED(global_dhcp_client_id, global.dhcp.client_id, "client id to send to the DHCP server"); -BAREBOX_MAGICVAR_NAMED(global_dhcp_user_class, global.dhcp.user_class, "user class to send to the DHCP server"); -BAREBOX_MAGICVAR_NAMED(global_dhcp_tftp_server_name, global.dhcp.tftp_server_name, "TFTP server Name returned from DHCP request"); -BAREBOX_MAGICVAR_NAMED(global_dhcp_oftree_file, global.dhcp.oftree_file, "OF tree returned from DHCP request (option 224)"); -BAREBOX_MAGICVAR_NAMED(global_dhcp_retries, global.dhcp.retries, "retry limit"); -BAREBOX_MAGICVAR_NAMED(global_dhcp_option224, global.dhcp.option224, "private data to send to the DHCP server (option 224)"); +BAREBOX_MAGICVAR(global.dhcp.bootfile, "bootfile returned from DHCP request"); +BAREBOX_MAGICVAR(global.dhcp.rootpath, "rootpath returned from DHCP request"); +BAREBOX_MAGICVAR(global.dhcp.vendor_id, "vendor id to send to the DHCP server"); +BAREBOX_MAGICVAR(global.dhcp.client_uuid, "client uuid to send to the DHCP server"); +BAREBOX_MAGICVAR(global.dhcp.client_id, "client id to send to the DHCP server"); +BAREBOX_MAGICVAR(global.dhcp.user_class, "user class to send to the DHCP server"); +BAREBOX_MAGICVAR(global.dhcp.tftp_server_name, "TFTP server Name returned from DHCP request"); +BAREBOX_MAGICVAR(global.dhcp.oftree_file, "OF tree returned from DHCP request (option 224)"); +BAREBOX_MAGICVAR(global.dhcp.retries, "retry limit"); +BAREBOX_MAGICVAR(global.dhcp.option224, "private data to send to the DHCP server (option 224)"); diff --git a/net/fastboot.c b/net/fastboot.c index a664fc8163..9082aa48f6 100644 --- a/net/fastboot.c +++ b/net/fastboot.c @@ -578,6 +578,5 @@ static void fastboot_net_exit(void) postenvironment_initcall(fastboot_on_boot); predevshutdown_exitcall(fastboot_net_exit); -BAREBOX_MAGICVAR_NAMED(global_fastboot_net_autostart, - global.fastboot.net.autostart, - "If true, automatically start fastboot over UDP during startup"); +BAREBOX_MAGICVAR(global.fastboot.net.autostart, + "If true, automatically start fastboot over UDP during startup"); diff --git a/net/ifup.c b/net/ifup.c index 6b56c3a49b..4b69777c16 100644 --- a/net/ifup.c +++ b/net/ifup.c @@ -318,9 +318,8 @@ static int ifup_all_init(void) } late_initcall(ifup_all_init); -BAREBOX_MAGICVAR_NAMED(global_net_ifup_force_detect, - global.net.ifup_force_detect, - "net: force detection of devices on ifup -a"); +BAREBOX_MAGICVAR(global.net.ifup_force_detect, + "net: force detection of devices on ifup -a"); #if IS_ENABLED(CONFIG_NET_CMD_IFUP) @@ -753,6 +753,6 @@ static int net_init(void) postcore_initcall(net_init); -BAREBOX_MAGICVAR_NAMED(global_net_nameserver, global.net.nameserver, "The DNS server used for resolving host names"); -BAREBOX_MAGICVAR_NAMED(global_net_domainname, global.net.domainname, "Domain name used for DNS requests"); -BAREBOX_MAGICVAR_NAMED(global_net_server, global.net.server, "Standard server used for NFS/TFTP"); +BAREBOX_MAGICVAR(global.net.nameserver, "The DNS server used for resolving host names"); +BAREBOX_MAGICVAR(global.net.domainname, "Domain name used for DNS requests"); +BAREBOX_MAGICVAR(global.net.server, "Standard server used for NFS/TFTP"); |