mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/2] defaultenv-2: select BOOTM
@ 2016-06-23 14:06 Lucas Stach
  2016-06-23 14:06 ` [PATCH 2/2] mtd: fix mtdraw_erase stub signature Lucas Stach
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Lucas Stach @ 2016-06-23 14:06 UTC (permalink / raw)
  To: barebox

defualtenv-2 selects CMD_BOOT, which in turn needs BOOTM.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 common/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/Kconfig b/common/Kconfig
index 679954e4db2e..e17e54b6fe5d 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -830,6 +830,7 @@ config DEFAULT_ENVIRONMENT_GENERIC_NEW
 	bool
 	depends on DEFAULT_ENVIRONMENT
 	depends on SHELL_HUSH
+	select BOOTM
 	select COMMAND_SUPPORT
 	select CMD_GETOPT
 	select GLOB
-- 
2.8.1


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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 2/2] mtd: fix mtdraw_erase stub signature
  2016-06-23 14:06 [PATCH 1/2] defaultenv-2: select BOOTM Lucas Stach
@ 2016-06-23 14:06 ` Lucas Stach
  2016-06-24  6:30   ` Uwe Kleine-König
  2016-06-24  6:24 ` [PATCH 1/2] defaultenv-2: select BOOTM Sascha Hauer
  2016-06-24  6:30 ` Uwe Kleine-König
  2 siblings, 1 reply; 5+ messages in thread
From: Lucas Stach @ 2016-06-23 14:06 UTC (permalink / raw)
  To: barebox

Commit 81737c1d436a (mtd: Fix erasing of devices >4GiB) changed the
prototype of the erase function, but fogot to fix up the stub function
used when no MTD write support is built in.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/mtd/mtdraw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/mtdraw.c b/drivers/mtd/mtdraw.c
index b06eb18f3f4d..d0b5f759263d 100644
--- a/drivers/mtd/mtdraw.c
+++ b/drivers/mtd/mtdraw.c
@@ -281,7 +281,7 @@ static ssize_t mtdraw_write(struct cdev *cdev, const void *buf, size_t count,
 {
 	return 0;
 }
-static ssize_t mtdraw_erase(struct cdev *cdev, size_t count, loff_t offset)
+static ssize_t mtdraw_erase(struct cdev *cdev, loff_t count, loff_t offset)
 {
 	return 0;
 }
-- 
2.8.1


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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] defaultenv-2: select BOOTM
  2016-06-23 14:06 [PATCH 1/2] defaultenv-2: select BOOTM Lucas Stach
  2016-06-23 14:06 ` [PATCH 2/2] mtd: fix mtdraw_erase stub signature Lucas Stach
@ 2016-06-24  6:24 ` Sascha Hauer
  2016-06-24  6:30 ` Uwe Kleine-König
  2 siblings, 0 replies; 5+ messages in thread
From: Sascha Hauer @ 2016-06-24  6:24 UTC (permalink / raw)
  To: Lucas Stach; +Cc: barebox

On Thu, Jun 23, 2016 at 04:06:29PM +0200, Lucas Stach wrote:
> defualtenv-2 selects CMD_BOOT, which in turn needs BOOTM.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  common/Kconfig | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks

Sascha

> 
> diff --git a/common/Kconfig b/common/Kconfig
> index 679954e4db2e..e17e54b6fe5d 100644
> --- a/common/Kconfig
> +++ b/common/Kconfig
> @@ -830,6 +830,7 @@ config DEFAULT_ENVIRONMENT_GENERIC_NEW
>  	bool
>  	depends on DEFAULT_ENVIRONMENT
>  	depends on SHELL_HUSH
> +	select BOOTM
>  	select COMMAND_SUPPORT
>  	select CMD_GETOPT
>  	select GLOB
> -- 
> 2.8.1
> 
> 
> _______________________________________________
> 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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] defaultenv-2: select BOOTM
  2016-06-23 14:06 [PATCH 1/2] defaultenv-2: select BOOTM Lucas Stach
  2016-06-23 14:06 ` [PATCH 2/2] mtd: fix mtdraw_erase stub signature Lucas Stach
  2016-06-24  6:24 ` [PATCH 1/2] defaultenv-2: select BOOTM Sascha Hauer
@ 2016-06-24  6:30 ` Uwe Kleine-König
  2 siblings, 0 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2016-06-24  6:30 UTC (permalink / raw)
  To: Lucas Stach; +Cc: barebox

On Thu, Jun 23, 2016 at 04:06:29PM +0200, Lucas Stach wrote:
> defualtenv-2 selects CMD_BOOT, which in turn needs BOOTM.

s/ua/au/

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] mtd: fix mtdraw_erase stub signature
  2016-06-23 14:06 ` [PATCH 2/2] mtd: fix mtdraw_erase stub signature Lucas Stach
@ 2016-06-24  6:30   ` Uwe Kleine-König
  0 siblings, 0 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2016-06-24  6:30 UTC (permalink / raw)
  To: Lucas Stach; +Cc: barebox

Hello,

On Thu, Jun 23, 2016 at 04:06:30PM +0200, Lucas Stach wrote:
> Commit 81737c1d436a (mtd: Fix erasing of devices >4GiB) changed the
> prototype of the erase function, but fogot to fix up the stub function

and another typo: s/og/org/

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-06-24  6:31 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-23 14:06 [PATCH 1/2] defaultenv-2: select BOOTM Lucas Stach
2016-06-23 14:06 ` [PATCH 2/2] mtd: fix mtdraw_erase stub signature Lucas Stach
2016-06-24  6:30   ` Uwe Kleine-König
2016-06-24  6:24 ` [PATCH 1/2] defaultenv-2: select BOOTM Sascha Hauer
2016-06-24  6:30 ` Uwe Kleine-König

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox