diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 16:23:51 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-05-17 16:23:51 +0200 |
| commit | dee7a15dfaa640130d0b9bc289e5d55b358a2dbc (patch) | |
| tree | 8ea7b1c341b1ea5453d1a3576fb238dc21edaa37 /net | |
| parent | c5e0e697de769d0e78a00b1cb47fe864fade9974 (diff) | |
| parent | 7ef2912d40b52202f563806fbffb9f615d2d2220 (diff) | |
| download | barebox-dee7a15dfaa640130d0b9bc289e5d55b358a2dbc.tar.gz barebox-dee7a15dfaa640130d0b9bc289e5d55b358a2dbc.tar.xz | |
Merge branch 'for-next/usb-gadget'
Diffstat (limited to 'net')
| -rw-r--r-- | net/Kconfig | 1 | ||||
| -rw-r--r-- | net/fastboot.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/net/Kconfig b/net/Kconfig index 1549c9af6b..3512055c45 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -35,7 +35,6 @@ config NET_SNTP config NET_FASTBOOT bool select BANNER - select FILE_LIST select FASTBOOT_BASE prompt "Android Fastboot support" help diff --git a/net/fastboot.c b/net/fastboot.c index 9082aa48f6..df388adc89 100644 --- a/net/fastboot.c +++ b/net/fastboot.c @@ -499,7 +499,6 @@ void fastboot_net_free(struct fastboot_net *fbn) struct fastboot_net *fastboot_net_init(struct fastboot_opts *opts) { struct fastboot_net *fbn; - const char *partitions = get_fastboot_partitions(); bool bbu = get_fastboot_bbu(); int ret; @@ -513,8 +512,7 @@ struct fastboot_net *fastboot_net_init(struct fastboot_opts *opts) fbn->fastboot.cmd_flash = opts->cmd_flash; ret = fastboot_generic_init(&fbn->fastboot, opts->export_bbu); } else { - fbn->fastboot.files = file_list_parse(partitions ? - partitions : ""); + fbn->fastboot.files = get_fastboot_partitions() ?: file_list_parse(""); ret = fastboot_generic_init(&fbn->fastboot, bbu); } if (ret) |