[PATCH] efi: make sure efi-fs is started in the right order

[PATCH] efi: make sure efi-fs is started in the right order

[Oleksij Rempel]

From: Michael Olbrich <m.olbrich@pengutronix.de>

with this parch, EFI System partition will be mounted to /boot
instead of /mnt/diskXX.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
---
 fs/efi.c                 | 2 +-
 include/efi/efi-device.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/efi.c b/fs/efi.c
index 85ff91429..692556b26 100644
--- a/fs/efi.c
+++ b/fs/efi.c
@@ -558,4 +558,4 @@ static struct efi_driver efi_fs_driver = {
         .probe = efi_fs_probe,
 	.guid = EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID,
 };
-device_efi_driver(efi_fs_driver);
+fs_efi_driver(efi_fs_driver);
diff --git a/include/efi/efi-device.h b/include/efi/efi-device.h
index 8f5f1f3f1..15c293bb1 100644
--- a/include/efi/efi-device.h
+++ b/include/efi/efi-device.h
@@ -33,6 +33,8 @@ static inline struct efi_driver *to_efi_driver(struct driver_d *drv)
 #define device_efi_driver(drv)	\
 	register_driver_macro(device, efi, drv)
 
+#define fs_efi_driver(drv)	\
+	register_driver_macro(fs, efi, drv)
 static inline int efi_driver_register(struct efi_driver *efidrv)
 {
 	efidrv->driver.bus = &efi_bus;
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] efi: make sure efi-fs is started in the right order

[Sascha Hauer]

On Wed, Sep 06, 2017 at 02:40:08PM +0200, Oleksij Rempel wrote:
> From: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> with this parch, EFI System partition will be mounted to /boot
> instead of /mnt/diskXX.
> 
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
> ---
>  fs/efi.c                 | 2 +-
>  include/efi/efi-device.h | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/fs/efi.c b/fs/efi.c
> index 85ff91429..692556b26 100644
> --- a/fs/efi.c
> +++ b/fs/efi.c
> @@ -558,4 +558,4 @@ static struct efi_driver efi_fs_driver = {
>          .probe = efi_fs_probe,
>  	.guid = EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID,
>  };
> -device_efi_driver(efi_fs_driver);
> +fs_efi_driver(efi_fs_driver);
> diff --git a/include/efi/efi-device.h b/include/efi/efi-device.h
> index 8f5f1f3f1..15c293bb1 100644
> --- a/include/efi/efi-device.h
> +++ b/include/efi/efi-device.h
> @@ -33,6 +33,8 @@ static inline struct efi_driver *to_efi_driver(struct driver_d *drv)
>  #define device_efi_driver(drv)	\
>  	register_driver_macro(device, efi, drv)
>  
> +#define fs_efi_driver(drv)	\
> +	register_driver_macro(fs, efi, drv)
>  static inline int efi_driver_register(struct efi_driver *efidrv)
>  {
>  	efidrv->driver.bus = &efi_bus;
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox