Message ID | 1416742971-25255-2-git-send-email-hdegoede@redhat.com |
---|---|
State | Superseded |
Delegated to: | Ian Campbell |
Headers | show |
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 3f890b2..7b958f8 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -302,12 +302,11 @@ func(PXE, pxe, na) \ func(DHCP, dhcp, na) -#include <config_distro_bootcmd.h> - #ifdef CONFIG_USB_KEYBOARD #define CONSOLE_STDIN_SETTINGS \ "preboot=usb start\0" \ "stdin=serial,usbkbd\0" +#define BOOTENV_PREBOOT_INITS_USB #else #define CONSOLE_STDIN_SETTINGS \ "stdin=serial\0" @@ -327,6 +326,8 @@ CONSOLE_STDIN_SETTINGS \ CONSOLE_STDOUT_SETTINGS +#include <config_distro_bootcmd.h> + #define CONFIG_EXTRA_ENV_SETTINGS \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \
Use the new BOOTENV_PREBOOT_INITS_USB define to avoid usb being scanned twice when using usb kbd + usb boot. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- include/configs/sunxi-common.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)