| Message ID | 1416741276-16306-1-git-send-email-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Delegated to: | Hans de Goede |
| Headers | show |
On Sun, 2014-11-23 at 12:14 +0100, Hans de Goede wrote: > In an effort to avoid usb getting scanned twice when using an usb keyboard, > and booting from usb, I've set preboot to "run usb_init" in the > CONFIG_USB_KEYBOARD patch. > > This is wrong however, as it causes usb to not be scanned (and the keyboard to > not be found) if an "env save" is done, since then the env > contains usb_need_init=false. > > This commit fixes this by changing the preboot value to "usb start", so that > usb gets scanned for a keyboard unconditionally when usb-keyboard support is > enabled. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk> > --- > include/configs/sunxi-common.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h > index fcaa249..3f890b2 100644 > --- a/include/configs/sunxi-common.h > +++ b/include/configs/sunxi-common.h > @@ -306,7 +306,7 @@ > > #ifdef CONFIG_USB_KEYBOARD > #define CONSOLE_STDIN_SETTINGS \ > - "preboot=run usb_init\0" \ > + "preboot=usb start\0" \ > "stdin=serial,usbkbd\0" > #else > #define CONSOLE_STDIN_SETTINGS \
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index fcaa249..3f890b2 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -306,7 +306,7 @@ #ifdef CONFIG_USB_KEYBOARD #define CONSOLE_STDIN_SETTINGS \ - "preboot=run usb_init\0" \ + "preboot=usb start\0" \ "stdin=serial,usbkbd\0" #else #define CONSOLE_STDIN_SETTINGS \
In an effort to avoid usb getting scanned twice when using an usb keyboard, and booting from usb, I've set preboot to "run usb_init" in the CONFIG_USB_KEYBOARD patch. This is wrong however, as it causes usb to not be scanned (and the keyboard to not be found) if an "env save" is done, since then the env contains usb_need_init=false. This commit fixes this by changing the preboot value to "usb start", so that usb gets scanned for a keyboard unconditionally when usb-keyboard support is enabled. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- include/configs/sunxi-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)