Merge branch 'for-next/login'

2 files changed, 6 insertions, 19 deletions

diff --git a/include/console.h b/include/console.h
index a6737c8581..4b2f134a4c 100644
--- a/include/console.h
+++ b/include/console.h
@@ -71,9 +71,6 @@ extern struct list_head console_list;
 
 #define CFG_PBSIZE (CONFIG_CBSIZE+sizeof(CONFIG_PROMPT)+16)
 
-bool console_is_input_allow(void);
-void console_allow_input(bool val);
-
 extern int barebox_loglevel;
 
 struct console_device *console_get_first_active(void);
diff --git a/include/password.h b/include/password.h
index 0dd1054054..8b9961815f 100644
--- a/include/password.h
+++ b/include/password.h
@@ -26,25 +26,15 @@
 #define CLEAR	(1 << 2)
 
 int password(unsigned char *passwd, size_t length, int flags, int timeout);
-
-int read_passwd(unsigned char *sum, size_t length);
-int check_passwd(unsigned char* passwd, size_t length);
-
-int read_env_passwd(unsigned char *sum, size_t length);
-int write_env_passwd(unsigned char *sum, size_t length);
-
-int read_default_passwd(unsigned char *sum, size_t length);
-int is_passwd_default_enable(void);
-int check_default_passwd(unsigned char* passwd, size_t length);
-
-int is_passwd_env_enable(void);
 int passwd_env_disable(void);
-int check_env_passwd(unsigned char* passwd, size_t length);
-int set_env_passwd(unsigned char* passwd, size_t length);
+int set_env_passwd(unsigned char *passwd, size_t length);
 
-static inline int is_passwd_enable(void)
+#ifdef CONFIG_PASSWORD
+void login(void);
+#else
+static inline void login(void)
 {
-	return is_passwd_default_enable() || is_passwd_env_enable();
 }
+#endif
 
 #endif /* __PASSWORD_H__ */