From: robertkaiser <robertkaiser>
Date: Thu, 13 Mar 2003 18:29:01 +0000 (+0000)
Subject: Bump version number
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=09048b0ea250bb5954e1a5741e780506c6646481;p=users%2Frw%2Farmboot.git

Bump version number
---

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index ebcf169..62e631a 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -418,6 +418,17 @@ int _do_setenv (bd_t *bd, int flag, int argc, char *argv[])
     }
 #endif	/* CONFIG_KEYBOARD */
 
+#ifdef CONFIG_ADJUST_LCD
+    if (strcmp(argv[1],"contrast") == 0) {
+	lcd_contrast(simple_strtoul(argv[2], NULL, 10));
+	return 0;
+	}
+    if (strcmp(argv[1],"brightness") == 0) {
+	lcd_brightness(simple_strtoul(argv[2], NULL, 10));
+	return 0;
+	}
+#endif	/* CONFIG_ADJUST_LCD */
+
     return 0;
 }
 
@@ -624,4 +635,20 @@ void env_relocate(bd_t *bd)
         copy_filename (BootFile, s, sizeof(BootFile));
     }
 #endif  /* CFG_CMD_NET */
+
+#ifdef CONFIG_KEYBOARD
+    if ((s = getenv(bd, "keymap")) != NULL) {
+		kbd_mapping (s);
+    }
+#endif	/* CONFIG_KEYBOARD */
+
+#ifdef CONFIG_ADJUST_LCD
+    if ((s = getenv(bd, "contrast")) != NULL) {
+		lcd_contrast(simple_strtoul(s, NULL, 10));
+	}
+    if ((s = getenv(bd, "brightness")) != NULL) {
+		lcd_brightness(simple_strtoul(s, NULL, 10));
+	}
+#endif	/* CONFIG_ADJUST_LCD */
+
 }
diff --git a/include/armboot.h b/include/armboot.h
index 8cef359..26d4ecc 100644
--- a/include/armboot.h
+++ b/include/armboot.h
@@ -251,6 +251,11 @@ int     kbd_tstc(void);
 void    kbd_mapping(const char *name);
 #endif
 
+#ifdef CONFIG_ADJUST_LCD
+int lcd_contrast(int);
+int lcd_brightness(int);
+#endif
+
 
 /* Byte swapping stuff */
 #define SWAP16(x)	((((x) & 0xff) << 8) | ((x) >> 8))
diff --git a/include/version.h b/include/version.h
index e89d03b..b1835e5 100644
--- a/include/version.h
+++ b/include/version.h
@@ -25,6 +25,6 @@
 #ifndef	__VERSION_H__
 #define	__VERSION_H__
 
-#define	ARMBOOT_VERSION	"ARMboot 1.0.2"
+#define	ARMBOOT_VERSION	"ARMboot 1.1.1"
 
 #endif	/* __VERSION_H__ */