mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] input: Compile keymap only if necessary
@ 2016-06-19 17:53 Alexander Shiyan
  2016-06-20  6:34 ` Sascha Hauer
  2016-07-04 13:48 ` Antony Pavlov
  0 siblings, 2 replies; 4+ messages in thread
From: Alexander Shiyan @ 2016-06-19 17:53 UTC (permalink / raw)
  To: barebox

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 drivers/input/Makefile   | 3 +--
 include/input/keyboard.h | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index 7d2c194..e694a98 100644
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -1,8 +1,7 @@
-obj-$(CONFIG_INPUT) += input.o
+obj-$(CONFIG_INPUT) += input.o keymap.o
 obj-$(CONFIG_INPUT_MATRIXKMAP) += matrix-keymap.o
 obj-$(CONFIG_KEYBOARD_USB) += usb_kbd.o
 obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o
 obj-$(CONFIG_KEYBOARD_TWL6030) += twl6030_pwrbtn.o
 obj-$(CONFIG_KEYBOARD_IMX_KEYPAD) += imx_keypad.o
 obj-$(CONFIG_KEYBOARD_QT1070) += qt1070.o
-obj-y += keymap.o
diff --git a/include/input/keyboard.h b/include/input/keyboard.h
index d1f5bf5..e205a51 100644
--- a/include/input/keyboard.h
+++ b/include/input/keyboard.h
@@ -1,6 +1,8 @@
 #ifndef __INPUT_KEYBOARD_H
 #define __INPUT_KEYBOARD_H
 
+#ifdef CONFIG_INPUT
+
 #include <linux/types.h>
 
 #define NR_KEYS	256
@@ -9,3 +11,5 @@ extern uint8_t keycode_bb_keys[NR_KEYS];
 extern uint8_t keycode_bb_shift_keys[NR_KEYS];
 
 #endif
+
+#endif
-- 
2.4.9


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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] input: Compile keymap only if necessary
  2016-06-19 17:53 [PATCH] input: Compile keymap only if necessary Alexander Shiyan
@ 2016-06-20  6:34 ` Sascha Hauer
  2016-07-04 13:48 ` Antony Pavlov
  1 sibling, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2016-06-20  6:34 UTC (permalink / raw)
  To: Alexander Shiyan; +Cc: barebox

On Sun, Jun 19, 2016 at 08:53:33PM +0300, Alexander Shiyan wrote:
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  drivers/input/Makefile   | 3 +--
>  include/input/keyboard.h | 4 ++++
>  2 files changed, 5 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/input/Makefile b/drivers/input/Makefile
> index 7d2c194..e694a98 100644
> --- a/drivers/input/Makefile
> +++ b/drivers/input/Makefile
> @@ -1,8 +1,7 @@
> -obj-$(CONFIG_INPUT) += input.o
> +obj-$(CONFIG_INPUT) += input.o keymap.o
>  obj-$(CONFIG_INPUT_MATRIXKMAP) += matrix-keymap.o
>  obj-$(CONFIG_KEYBOARD_USB) += usb_kbd.o
>  obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o
>  obj-$(CONFIG_KEYBOARD_TWL6030) += twl6030_pwrbtn.o
>  obj-$(CONFIG_KEYBOARD_IMX_KEYPAD) += imx_keypad.o
>  obj-$(CONFIG_KEYBOARD_QT1070) += qt1070.o
> -obj-y += keymap.o
> diff --git a/include/input/keyboard.h b/include/input/keyboard.h
> index d1f5bf5..e205a51 100644
> --- a/include/input/keyboard.h
> +++ b/include/input/keyboard.h
> @@ -1,6 +1,8 @@
>  #ifndef __INPUT_KEYBOARD_H
>  #define __INPUT_KEYBOARD_H
>  
> +#ifdef CONFIG_INPUT
> +
>  #include <linux/types.h>
>  
>  #define NR_KEYS	256
> @@ -9,3 +11,5 @@ extern uint8_t keycode_bb_keys[NR_KEYS];
>  extern uint8_t keycode_bb_shift_keys[NR_KEYS];
>  
>  #endif
> +
> +#endif
> -- 
> 2.4.9
> 
> 
> _______________________________________________
> 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] 4+ messages in thread
* Re: [PATCH] input: Compile keymap only if necessary
  2016-06-19 17:53 [PATCH] input: Compile keymap only if necessary Alexander Shiyan
  2016-06-20  6:34 ` Sascha Hauer
@ 2016-07-04 13:48 ` Antony Pavlov
  2016-07-11  6:31   ` Sascha Hauer
  1 sibling, 1 reply; 4+ messages in thread
From: Antony Pavlov @ 2016-07-04 13:48 UTC (permalink / raw)
  To: Alexander Shiyan; +Cc: barebox

On Sun, 19 Jun 2016 20:53:33 +0300
Alexander Shiyan <shc_work@mail.ru> wrote:

> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  drivers/input/Makefile   | 3 +--
>  include/input/keyboard.h | 4 ++++
>  2 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/input/Makefile b/drivers/input/Makefile
> index 7d2c194..e694a98 100644
> --- a/drivers/input/Makefile
> +++ b/drivers/input/Makefile
> @@ -1,8 +1,7 @@
> -obj-$(CONFIG_INPUT) += input.o
> +obj-$(CONFIG_INPUT) += input.o keymap.o
>  obj-$(CONFIG_INPUT_MATRIXKMAP) += matrix-keymap.o
>  obj-$(CONFIG_KEYBOARD_USB) += usb_kbd.o
>  obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o
>  obj-$(CONFIG_KEYBOARD_TWL6030) += twl6030_pwrbtn.o
>  obj-$(CONFIG_KEYBOARD_IMX_KEYPAD) += imx_keypad.o
>  obj-$(CONFIG_KEYBOARD_QT1070) += qt1070.o
> -obj-y += keymap.o
> diff --git a/include/input/keyboard.h b/include/input/keyboard.h
> index d1f5bf5..e205a51 100644
> --- a/include/input/keyboard.h
> +++ b/include/input/keyboard.h
> @@ -1,6 +1,8 @@
>  #ifndef __INPUT_KEYBOARD_H
>  #define __INPUT_KEYBOARD_H
>  
> +#ifdef CONFIG_INPUT
> +

Do we really need this?

>  #include <linux/types.h>
>  
>  #define NR_KEYS	256
> @@ -9,3 +11,5 @@ extern uint8_t keycode_bb_keys[NR_KEYS];
>  extern uint8_t keycode_bb_shift_keys[NR_KEYS];
>  
>  #endif
> +
> +#endif
> -- 
> 2.4.9
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox


-- 
-- 
Best regards,
  Antony Pavlov

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] input: Compile keymap only if necessary
  2016-07-04 13:48 ` Antony Pavlov
@ 2016-07-11  6:31   ` Sascha Hauer
  0 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2016-07-11  6:31 UTC (permalink / raw)
  To: Antony Pavlov; +Cc: barebox

On Mon, Jul 04, 2016 at 04:48:10PM +0300, Antony Pavlov wrote:
> On Sun, 19 Jun 2016 20:53:33 +0300
> Alexander Shiyan <shc_work@mail.ru> wrote:
> 
> > Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> > ---
> >  drivers/input/Makefile   | 3 +--
> >  include/input/keyboard.h | 4 ++++
> >  2 files changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/drivers/input/Makefile b/drivers/input/Makefile
> > index 7d2c194..e694a98 100644
> > --- a/drivers/input/Makefile
> > +++ b/drivers/input/Makefile
> > @@ -1,8 +1,7 @@
> > -obj-$(CONFIG_INPUT) += input.o
> > +obj-$(CONFIG_INPUT) += input.o keymap.o
> >  obj-$(CONFIG_INPUT_MATRIXKMAP) += matrix-keymap.o
> >  obj-$(CONFIG_KEYBOARD_USB) += usb_kbd.o
> >  obj-$(CONFIG_KEYBOARD_GPIO) += gpio_keys.o
> >  obj-$(CONFIG_KEYBOARD_TWL6030) += twl6030_pwrbtn.o
> >  obj-$(CONFIG_KEYBOARD_IMX_KEYPAD) += imx_keypad.o
> >  obj-$(CONFIG_KEYBOARD_QT1070) += qt1070.o
> > -obj-y += keymap.o
> > diff --git a/include/input/keyboard.h b/include/input/keyboard.h
> > index d1f5bf5..e205a51 100644
> > --- a/include/input/keyboard.h
> > +++ b/include/input/keyboard.h
> > @@ -1,6 +1,8 @@
> >  #ifndef __INPUT_KEYBOARD_H
> >  #define __INPUT_KEYBOARD_H
> >  
> > +#ifdef CONFIG_INPUT
> > +
> 
> Do we really need this?

Erm, no, we shouldn't need this. I removed this hunk from the patch.

Sascha

-- 
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] 4+ messages in thread
end of thread, other threads:[~2016-07-11  6:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-19 17:53 [PATCH] input: Compile keymap only if necessary Alexander Shiyan
2016-06-20  6:34 ` Sascha Hauer
2016-07-04 13:48 ` Antony Pavlov
2016-07-11  6:31   ` Sascha Hauer

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