Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master

* 'master' of ssh://gemini/home/wd/git/u-boot/master:
  board/emk/top860/top860.c: Fix GCC 4.6 build warning
  board/sbc405/strataflash.c: Fix GCC 4.6 build warning
  arch/powerpc/cpu/mpc86xx/cpu.c: Fix GCC 4.6 build warning
  board/freescale/mpc8610hpcd/mpc8610hpcd.c: Fix GCC 4.6 build warning
  board/mpl/common/flash.c: Fix GCC 4.6 build warning
  post/board/lwmon5/gdc.c: Fix GCC 4.6 build warning
  drivers/usb/host/sl811-hcd.c: Fix GCC 4.6 build warning
  board/sandburst/common/flash.c: Fix GCC 4.6 build warning
  DB64460: Fix GCC 4.6 build warnings
  DB64360: Fix GCC 4.6 build warnings
  board/cray/L1/flash.c: Fix GCC 4.6 build warning
  drivers/block/sata_dwc.c: Fix GCC 4.6 build warning
  board/amirix/ap1000/flash.c: Fix GCC 4.6 build warning
  alpr board: Fix GCC 4.6 build warnings
  image: Don't detect XIP images as overlapping.
  image: Implement IH_TYPE_KERNEL_NOLOAD
  ppc4xx: Add Io64 board support
  ppc4xx: fix PMC440 painit command
  ppc4xx: remove invalid access to PCI_BRDGOPT2 register
  ppc4xx: use CONFIG_PCI_BOOTDELAY instead of private implementation
  mpc85xx: support for Freescale COM Express P2020
  arch/powerpc/cpu/mpc8xxx/ddr/interactive.c: Fix GCC 4.6 build warning
  mpc85xx: support board-specific reset function
  powerpc/85xx: verify the localbus device tree address before booting the OS
  mpc8xxx: update module_type values from JEDEC DDR3 SPD Specification
  powerpc/p3060qds: Add board related support for P3060QDS platform
  powerpc/85xx: clean up and document the QE/FMAN microcode macros
  powerpc/85xx: always implement the work-around for Erratum SATA_A001
  powerpc/85xx: CONFIG_FSL_SATA_V2 should be defined in config_mpc85xx.h
  powerpc/85xx: Add workaround for erratum A-003474
  powerpc/85xx: fixup flexcan device tree clock-frequency
  powerpc/85xx: Add workaround for erratum CPU-A003999
  x86: Fix some bugs in the i8402 driver when no controller is present
  x86: Make the i8042 driver checkpatch clean
  x86: Wrap small helper functions from libgcc to avoid an ABI mismatch
  x86: Import the glibc memset implementation
  x86: Fix a few recently added bugs
  x86: Don't relocate symbols which point to things that aren't relocated
  x86: Fix how the location of the realmode and bios blobs are calculated
  x86: Misc cleanups
  x86: Misc PCI touchups
  x86: Ensure IDT and GDT remain 16-byte aligned post relocation
  x86: Provide more configuration granularity
  x86: Add multiboot header
  sc520: Create arch asm-offsets
  x86: Punt cold- and warm-boot flags
  cosmetic: checkpatch cleanup of board/eNET/*.c
  cosmetic: checkpatch cleanup of arch/x86/lib/*.c
  cosmetic: checkpatch cleanup of arch/x86/cpu/sc520/*.c
  cosmetic: checkpatch cleanup of arch/x86/cpu/*.c
  x86: Call hang() on unrecoverable exception
  menu.c: use puts() instead of printf() where possible
  MAKEALL: drop obsolete mx31pdk_nand target
  dataflash: fix parameters order in write_dataflash()
  hawkboard: Replace HAWKBOARD_KICK{0, 1}_UNLOCK defines
  davinci_sonata: define CONFIG_MACH_TYPE for davinci_sonata board
  davinci_schmoogie: define CONFIG_MACH_TYPE for davinci_schmoogie board
  arm: a320evb: define mach-type in board config file
  OMAP3: Use sdelay from arch/arm/cpu/armv7/syslib.c instead of cloning that.
  Fix Stelian's email address
  DIU: 1080P and 720P support
  CFB: Fix font rendering on mx5 framebuffer

7 files changed, 507 insertions, 549 deletions

diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c
index 6b35173..3026ade 100644
--- a/drivers/block/fsl_sata.c
+++ b/drivers/block/fsl_sata.c
@@ -197,27 +197,6 @@ int init_sata(int dev)
 	/* Wait the controller offline */
 	ata_wait_register(&reg->hstatus, HSTATUS_ONOFF, 0, 1000);
 
-#if defined(CONFIG_FSL_SATA_V2) && defined(CONFIG_FSL_SATA_ERRATUM_A001)
-	/*
-	 * For P1022/1013 Rev1.0 silicon, after power on SATA host
-	 * controller is configured in legacy mode instead of the
-	 * expected enterprise mode. software needs to clear bit[28]
-	 * of HControl register to change to enterprise mode from
-	 * legacy mode.
-	 */
-	{
-		u32 svr = get_svr();
-		if (IS_SVR_REV(svr, 1, 0) &&
-		    ((SVR_SOC_VER(svr) == SVR_P1022) ||
-		     (SVR_SOC_VER(svr) == SVR_P1022_E) ||
-		     (SVR_SOC_VER(svr) == SVR_P1013) ||
-		     (SVR_SOC_VER(svr) == SVR_P1013_E))) {
-			out_le32(&reg->hstatus, 0x20000000);
-			out_le32(&reg->hcontrol, 0x00000100);
-		}
-	}
-#endif
-
 	/* Set the command header base address to CHBA register to tell DMA */
 	out_le32(&reg->chba, (u32)cmd_hdr & ~0x3);
 
diff --git a/drivers/block/fsl_sata.h b/drivers/block/fsl_sata.h
index 576efaf..cecff68 100644
--- a/drivers/block/fsl_sata.h
+++ b/drivers/block/fsl_sata.h
@@ -103,6 +103,7 @@ typedef struct fsl_sata_reg {
 */
 #define HCONTROL_ONOFF			0x80000000 /* Online or offline request */
 #define HCONTROL_FORCE_OFFLINE		0x40000000 /* Force offline request */
+#define HCONTROL_ENTERPRISE_EN		0x10000000 /* Enterprise mode enabled */
 #define HCONTROL_HDR_SNOOP		0x00000400 /* Command header snoop */
 #define HCONTROL_PMP_ATTACHED		0x00000200 /* Port multiplier attached */
 
diff --git a/drivers/block/sata_dwc.c b/drivers/block/sata_dwc.c
index 69ec5fd..75101b5 100644
--- a/drivers/block/sata_dwc.c
+++ b/drivers/block/sata_dwc.c
@@ -532,7 +532,7 @@ int scan_sata(int dev)
 	u8 status;
 	const u16 *id;
 	struct ata_device *ata_dev = &ata_device;
-	unsigned long pio_mask, mwdma_mask, udma_mask;
+	unsigned long pio_mask, mwdma_mask;
 	char revbuf[7];
 	u16 iobuf[ATA_SECTOR_WORDS];
 
@@ -622,10 +622,6 @@ int scan_sata(int dev)
 			mwdma_mask |= (1 << 4);
 	}
 
-	udma_mask = 0;
-	if (id[ATA_ID_FIELD_VALID] & (1 << 2))
-		udma_mask = id[ATA_ID_UDMA_MODES] & 0xff;
-
 	if (ata_dev->class == ATA_DEV_ATA) {
 		if (ata_id_is_cfa(id)) {
 			if (id[162] & 1)
diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c
index 58094c9..c3bc536 100644
--- a/drivers/input/i8042.c
+++ b/drivers/input/i8042.c
@@ -28,11 +28,11 @@
 #include <common.h>
 
 #ifdef CONFIG_USE_CPCIDVI
-extern u8  gt_cpcidvi_in8(u32 offset);
+extern u8 gt_cpcidvi_in8(u32 offset);
 extern void gt_cpcidvi_out8(u32 offset, u8 data);
 
 #define in8(a)	   gt_cpcidvi_in8(a)
-#define out8(a, b) gt_cpcidvi_out8(a,b)
+#define out8(a, b) gt_cpcidvi_out8(a, b)
 #endif
 
 #include <i8042.h>
@@ -40,9 +40,9 @@ extern void gt_cpcidvi_out8(u32 offset, u8 data);
 /* defines */
 
 #ifdef CONFIG_CONSOLE_CURSOR
-extern void console_cursor (int state);
+extern void console_cursor(int state);
 static int blinkCount = CONFIG_SYS_CONSOLE_BLINK_COUNT;
-static int cursor_state = 0;
+static int cursor_state;
 #endif
 
 /* locals */
@@ -50,307 +50,313 @@ static int cursor_state = 0;
 static int  kbd_input	 = -1;		/* no input yet */
 static int  kbd_mapping	 = KBD_US;	/* default US keyboard */
 static int  kbd_flags	 = NORMAL;	/* after reset */
-static int  kbd_state	 = 0;		/* unshift code */
-
-static void kbd_conv_char (unsigned char scan_code);
-static void kbd_led_set (void);
-static void kbd_normal (unsigned char scan_code);
-static void kbd_shift (unsigned char scan_code);
-static void kbd_ctrl (unsigned char scan_code);
-static void kbd_num (unsigned char scan_code);
-static void kbd_caps (unsigned char scan_code);
-static void kbd_scroll (unsigned char scan_code);
-static void kbd_alt (unsigned char scan_code);
-static int  kbd_input_empty (void);
-static int  kbd_reset (void);
-
-static unsigned char kbd_fct_map [144] =
-    { /* kbd_fct_map table for scan code */
-    0,	 AS,   AS,   AS,   AS,	 AS,   AS,   AS, /* scan  0- 7 */
-   AS,	 AS,   AS,   AS,   AS,	 AS,   AS,   AS, /* scan  8- F */
-   AS,	 AS,   AS,   AS,   AS,	 AS,   AS,   AS, /* scan 10-17 */
-   AS,	 AS,   AS,   AS,   AS,	 CN,   AS,   AS, /* scan 18-1F */
-   AS,	 AS,   AS,   AS,   AS,	 AS,   AS,   AS, /* scan 20-27 */
-   AS,	 AS,   SH,   AS,   AS,	 AS,   AS,   AS, /* scan 28-2F */
-   AS,	 AS,   AS,   AS,   AS,	 AS,   SH,   AS, /* scan 30-37 */
-   AS,	 AS,   CP,   0,	   0,	 0,    0,     0, /* scan 38-3F */
-    0,	 0,    0,    0,	   0,	 NM,   ST,   ES, /* scan 40-47 */
-   ES,	 ES,   ES,   ES,   ES,	 ES,   ES,   ES, /* scan 48-4F */
-   ES,	 ES,   ES,   ES,   0,	 0,    AS,    0, /* scan 50-57 */
-    0,	 0,    0,    0,	   0,	 0,    0,     0, /* scan 58-5F */
-    0,	 0,    0,    0,	   0,	 0,    0,     0, /* scan 60-67 */
-    0,	 0,    0,    0,	   0,	 0,    0,     0, /* scan 68-6F */
-   AS,	 0,    0,    AS,   0,	 0,    AS,    0, /* scan 70-77 */
-    0,	 AS,   0,    0,	   0,	 AS,   0,     0, /* scan 78-7F */
-   AS,	 CN,   AS,   AS,   AK,	 ST,   EX,   EX, /* enhanced   */
-   AS,	 EX,   EX,   AS,   EX,	 AS,   EX,   EX	 /* enhanced   */
-    };
-
-static unsigned char kbd_key_map [2][5][144] =
-    {
-    { /* US keyboard */
-    { /* unshift code */
-    0,	0x1b,	'1',   '2',   '3',   '4',   '5',   '6',	   /* scan  0- 7 */
-  '7',	 '8',	'9',   '0',   '-',   '=',  0x08,  '\t',	   /* scan  8- F */
-  'q',	 'w',	'e',   'r',   't',   'y',   'u',   'i',	   /* scan 10-17 */
-  'o',	 'p',	'[',   ']',  '\r',   CN,    'a',   's',	   /* scan 18-1F */
-  'd',	 'f',	'g',   'h',   'j',   'k',   'l',   ';',	   /* scan 20-27 */
- '\'',	 '`',	SH,   '\\',   'z',   'x',   'c',   'v',	   /* scan 28-2F */
-  'b',	 'n',	'm',   ',',   '.',   '/',   SH,	   '*',	   /* scan 30-37 */
-  ' ',	 ' ',	CP,	 0,	0,     0,     0,     0,	   /* scan 38-3F */
-    0,	   0,	  0,	 0,	0,   NM,    ST,	   '7',	   /* scan 40-47 */
-  '8',	 '9',	'-',   '4',   '5',   '6',   '+',   '1',	   /* scan 48-4F */
-  '2',	 '3',	'0',   '.',	0,     0,     0,     0,	   /* scan 50-57 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 58-5F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 60-67 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 68-6F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 70-77 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 78-7F */
-  '\r',	  CN,	'/',   '*',   ' ',    ST,   'F',   'A',	   /* extended */
-    0,	 'D',	'C',	 0,   'B',     0,    '@',  'P'	   /* extended */
-    },
-    { /* shift code */
-    0,	0x1b,	'!',   '@',   '#',   '$',   '%',   '^',	   /* scan  0- 7 */
-  '&',	 '*',	'(',   ')',   '_',   '+',  0x08,  '\t',	   /* scan  8- F */
-  'Q',	 'W',	'E',   'R',   'T',   'Y',   'U',   'I',	   /* scan 10-17 */
-  'O',	 'P',	'{',   '}',  '\r',   CN,    'A',   'S',	   /* scan 18-1F */
-  'D',	 'F',	'G',   'H',   'J',   'K',   'L',   ':',	   /* scan 20-27 */
-  '"',	 '~',	SH,    '|',   'Z',   'X',   'C',   'V',	   /* scan 28-2F */
-  'B',	 'N',	'M',   '<',   '>',   '?',   SH,	   '*',	   /* scan 30-37 */
-  ' ',	 ' ',	CP,	 0,	0,     0,     0,     0,	   /* scan 38-3F */
-    0,	   0,	  0,	 0,	0,   NM,    ST,	   '7',	   /* scan 40-47 */
-  '8',	 '9',	'-',   '4',   '5',   '6',   '+',   '1',	   /* scan 48-4F */
-  '2',	 '3',	'0',   '.',	0,     0,     0,     0,	   /* scan 50-57 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 58-5F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 60-67 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 68-6F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 70-77 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 78-7F */
-  '\r',	  CN,	'/',   '*',   ' ',    ST,   'F',   'A',	   /* extended */
-    0,	 'D',	'C',	 0,   'B',     0,   '@',   'P'	   /* extended */
-    },
-    { /* control code */
- 0xff,	0x1b,  0xff,  0x00,  0xff,  0xff,  0xff,  0xff,	   /* scan  0- 7 */
- 0x1e,	0xff,  0xff,  0xff,  0x1f,  0xff,  0xff,  '\t',	   /* scan  8- F */
- 0x11,	0x17,  0x05,  0x12,  0x14,  0x19,  0x15,  0x09,	   /* scan 10-17 */
- 0x0f,	0x10,  0x1b,  0x1d,  '\r',   CN,   0x01,  0x13,	   /* scan 18-1F */
- 0x04,	0x06,  0x07,  0x08,  0x0a,  0x0b,  0x0c,  0xff,	   /* scan 20-27 */
- 0xff,	0x1c,	SH,   0xff,  0x1a,  0x18,  0x03,  0x16,	   /* scan 28-2F */
- 0x02,	0x0e,  0x0d,  0xff,  0xff,  0xff,   SH,	  0xff,	   /* scan 30-37 */
- 0xff,	0xff,	CP,   0xff,  0xff,  0xff,  0xff,  0xff,	   /* scan 38-3F */
- 0xff,	0xff,  0xff,  0xff,  0xff,   NM,    ST,	  0xff,	   /* scan 40-47 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,	   /* scan 48-4F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,	   /* scan 50-57 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,	   /* scan 58-5F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,	   /* scan 60-67 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,	   /* scan 68-6F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,	   /* scan 70-77 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff,	   /* scan 78-7F */
-  '\r',	  CN,	'/',   '*',   ' ',    ST,  0xff,  0xff,	   /* extended */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff	   /* extended */
-    },
-    { /* non numeric code */
-    0,	0x1b,	'1',   '2',   '3',   '4',   '5',   '6',	   /* scan  0- 7 */
-  '7',	 '8',	'9',   '0',   '-',   '=',  0x08,  '\t',	   /* scan  8- F */
-  'q',	 'w',	'e',   'r',   't',   'y',   'u',   'i',	   /* scan 10-17 */
-  'o',	 'p',	'[',   ']',  '\r',   CN,    'a',   's',	   /* scan 18-1F */
-  'd',	 'f',	'g',   'h',   'j',   'k',   'l',   ';',	   /* scan 20-27 */
- '\'',	 '`',	SH,   '\\',   'z',   'x',   'c',   'v',	   /* scan 28-2F */
-  'b',	 'n',	'm',   ',',   '.',   '/',   SH,	   '*',	   /* scan 30-37 */
-  ' ',	 ' ',	CP,	 0,	0,     0,     0,     0,	   /* scan 38-3F */
-    0,	   0,	  0,	 0,	0,   NM,    ST,	   'w',	   /* scan 40-47 */
-  'x',	 'y',	'l',   't',   'u',   'v',   'm',   'q',	   /* scan 48-4F */
-  'r',	 's',	'p',   'n',	0,     0,     0,     0,	   /* scan 50-57 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 58-5F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 60-67 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 68-6F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 70-77 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0,	   /* scan 78-7F */
-  '\r',	  CN,	'/',   '*',   ' ',    ST,   'F',   'A',	   /* extended */
-    0,	 'D',	'C',	 0,   'B',     0,    '@',  'P'	   /* extended */
-    },
-    { /* right alt mode - not used in US keyboard */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan	 0 - 7 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan	 8 - F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 10 -17 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 18 -1F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 20 -27 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 28 -2F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 30 -37 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 38 -3F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 40 -47 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 48 -4F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 50 -57 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 58 -5F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 60 -67 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 68 -6F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 70 -77 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 78 -7F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* extended    */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff	/* extended    */
-    }
-    },
-    { /* german keyboard */
-    { /* unshift code */
-    0,	0x1b,	'1',   '2',   '3',   '4',   '5',   '6', /* scan	 0- 7 */
-  '7',	 '8',	'9',   '0',  0xe1,  '\'',  0x08,  '\t', /* scan	 8- F */
-  'q',	 'w',	'e',   'r',   't',   'z',   'u',   'i', /* scan 10-17 */
-  'o',	 'p',  0x81,   '+',  '\r',   CN,    'a',   's', /* scan 18-1F */
-  'd',	 'f',	'g',   'h',   'j',   'k',   'l',  0x94, /* scan 20-27 */
- 0x84,	 '^',	SH,    '#',   'y',   'x',   'c',   'v', /* scan 28-2F */
-  'b',	 'n',	'm',   ',',   '.',   '-',   SH,	   '*', /* scan 30-37 */
-  ' ',	 ' ',	CP,	 0,	0,     0,     0,     0, /* scan 38-3F */
-    0,	   0,	  0,	 0,	0,   NM,    ST,	   '7', /* scan 40-47 */
-  '8',	 '9',	'-',   '4',   '5',   '6',   '+',   '1', /* scan 48-4F */
-  '2',	 '3',	'0',   ',',	0,     0,   '<',     0, /* scan 50-57 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 58-5F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 60-67 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 68-6F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 70-77 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 78-7F */
-  '\r',	  CN,	'/',   '*',   ' ',    ST,   'F',   'A', /* extended */
-    0,	 'D',	'C',	 0,   'B',     0,    '@',  'P'	/* extended */
-    },
-    { /* shift code */
-    0,	0x1b,	'!',   '"',  0x15,   '$',   '%',   '&', /* scan	 0- 7 */
-  '/',	 '(',	')',   '=',   '?',   '`',  0x08,  '\t', /* scan	 8- F */
-  'Q',	 'W',	'E',   'R',   'T',   'Z',   'U',   'I', /* scan 10-17 */
-  'O',	 'P',  0x9a,   '*',  '\r',   CN,    'A',   'S', /* scan 18-1F */
-  'D',	 'F',	'G',   'H',   'J',   'K',   'L',  0x99, /* scan 20-27 */
- 0x8e,	0xf8,	SH,   '\'',   'Y',   'X',   'C',   'V', /* scan 28-2F */
-  'B',	 'N',	'M',   ';',   ':',   '_',   SH,	   '*', /* scan 30-37 */
-  ' ',	 ' ',	CP,	 0,	0,     0,     0,     0, /* scan 38-3F */
-    0,	   0,	  0,	 0,	0,   NM,    ST,	   '7', /* scan 40-47 */
-  '8',	 '9',	'-',   '4',   '5',   '6',   '+',   '1', /* scan 48-4F */
-  '2',	 '3',	'0',   ',',	0,     0,   '>',     0, /* scan 50-57 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 58-5F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 60-67 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 68-6F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 70-77 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 78-7F */
-  '\r',	  CN,	'/',   '*',   ' ',    ST,   'F',   'A', /* extended */
-    0,	 'D',	'C',	 0,   'B',     0,   '@',   'P'	/* extended */
-    },
-    { /* control code */
- 0xff,	0x1b,  0xff,  0x00,  0xff,  0xff,  0xff,  0xff, /* scan	 0- 7 */
- 0x1e,	0xff,  0xff,  0xff,  0x1f,  0xff,  0xff,  '\t', /* scan	 8- F */
- 0x11,	0x17,  0x05,  0x12,  0x14,  0x19,  0x15,  0x09, /* scan 10-17 */
- 0x0f,	0x10,  0x1b,  0x1d,  '\r',   CN,   0x01,  0x13, /* scan 18-1F */
- 0x04,	0x06,  0x07,  0x08,  0x0a,  0x0b,  0x0c,  0xff, /* scan 20-27 */
- 0xff,	0x1c,	SH,   0xff,  0x1a,  0x18,  0x03,  0x16, /* scan 28-2F */
- 0x02,	0x0e,  0x0d,  0xff,  0xff,  0xff,   SH,	  0xff, /* scan 30-37 */
- 0xff,	0xff,	CP,   0xff,  0xff,  0xff,  0xff,  0xff, /* scan 38-3F */
- 0xff,	0xff,  0xff,  0xff,  0xff,   NM,    ST,	  0xff, /* scan 40-47 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 48-4F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 50-57 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 58-5F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 60-67 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 68-6F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 70-77 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 78-7F */
-  '\r',	  CN,	'/',   '*',   ' ',    ST,  0xff,  0xff, /* extended */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff	/* extended */
-    },
-    { /* non numeric code */
-    0,	0x1b,	'1',   '2',   '3',   '4',   '5',   '6', /* scan	 0- 7 */
-  '7',	 '8',	'9',   '0',  0xe1,  '\'',  0x08,  '\t', /* scan	 8- F */
-  'q',	 'w',	'e',   'r',   't',   'z',   'u',   'i', /* scan 10-17 */
-  'o',	 'p',  0x81,   '+',  '\r',   CN,    'a',   's', /* scan 18-1F */
-  'd',	 'f',	'g',   'h',   'j',   'k',   'l',  0x94, /* scan 20-27 */
- 0x84,	 '^',	SH,	 0,   'y',   'x',   'c',   'v', /* scan 28-2F */
-  'b',	 'n',	'm',   ',',   '.',   '-',   SH,	   '*', /* scan 30-37 */
-  ' ',	 ' ',	CP,	 0,	0,     0,     0,     0, /* scan 38-3F */
-    0,	   0,	  0,	 0,	0,   NM,    ST,	   'w', /* scan 40-47 */
-  'x',	 'y',	'l',   't',   'u',   'v',   'm',   'q', /* scan 48-4F */
-  'r',	 's',	'p',   'n',	0,     0,   '<',     0, /* scan 50-57 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 58-5F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 60-67 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 68-6F */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 70-77 */
-    0,	   0,	  0,	 0,	0,     0,     0,     0, /* scan 78-7F */
-  '\r',	  CN,	'/',   '*',   ' ',    ST,   'F',   'A', /* extended */
-    0,	 'D',	'C',	 0,   'B',     0,    '@',  'P'	/* extended */
-    },
-    { /* Right alt mode - is used in German keyboard */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan	 0 - 7 */
-  '{',	 '[',	']',   '}',  '\\',  0xff,  0xff,  0xff, /* scan	 8 - F */
-  '@',	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 10 -17 */
- 0xff,	0xff,  0xff,   '~',  0xff,  0xff,  0xff,  0xff, /* scan 18 -1F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 20 -27 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 28 -2F */
- 0xff,	0xff,  0xe6,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 30 -37 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 38 -3F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 40 -47 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 48 -4F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,   '|',  0xff, /* scan 50 -57 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 58 -5F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 60 -67 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 68 -6F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 70 -77 */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* scan 78 -7F */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff, /* extended    */
- 0xff,	0xff,  0xff,  0xff,  0xff,  0xff,  0xff,  0xff	/* extended    */
-    }
-    }
-    };
-
-static unsigned char ext_key_map [] =
-    {
-    0x1c,   /* keypad enter */
-    0x1d,   /* right control */
-    0x35,   /* keypad slash */
-    0x37,   /* print screen */
-    0x38,   /* right alt */
-    0x46,   /* break */
-    0x47,   /* editpad home */
-    0x48,   /* editpad up */
-    0x49,   /* editpad pgup */
-    0x4b,   /* editpad left */
-    0x4d,   /* editpad right */
-    0x4f,   /* editpad end */
-    0x50,   /* editpad dn */
-    0x51,   /* editpad pgdn */
-    0x52,   /* editpad ins */
-    0x53,   /* editpad del */
-    0x00    /* map end */
-    };
+static int  kbd_state;			/* unshift code */
+
+static void kbd_conv_char(unsigned char scan_code);
+static void kbd_led_set(void);
+static void kbd_normal(unsigned char scan_code);
+static void kbd_shift(unsigned char scan_code);
+static void kbd_ctrl(unsigned char scan_code);
+static void kbd_num(unsigned char scan_code);
+static void kbd_caps(unsigned char scan_code);
+static void kbd_scroll(unsigned char scan_code);
+static void kbd_alt(unsigned char scan_code);
+static int  kbd_input_empty(void);
+static int  kbd_reset(void);
+
+static unsigned char kbd_fct_map[144] = {
+	/* kbd_fct_map table for scan code */
+	 0,  AS,  AS,  AS,  AS,  AS,  AS,  AS, /* scan  0- 7 */
+	AS,  AS,  AS,  AS,  AS,  AS,  AS,  AS, /* scan  8- F */
+	AS,  AS,  AS,  AS,  AS,  AS,  AS,  AS, /* scan 10-17 */
+	AS,  AS,  AS,  AS,  AS,  CN,  AS,  AS, /* scan 18-1F */
+	AS,  AS,  AS,  AS,  AS,  AS,  AS,  AS, /* scan 20-27 */
+	AS,  AS,  SH,  AS,  AS,  AS,  AS,  AS, /* scan 28-2F */
+	AS,  AS,  AS,  AS,  AS,  AS,  SH,  AS, /* scan 30-37 */
+	AS,  AS,  CP,   0,   0,   0,   0,   0, /* scan 38-3F */
+	 0,   0,   0,   0,   0,  NM,  ST,  ES, /* scan 40-47 */
+	ES,  ES,  ES,  ES,  ES,  ES,  ES,  ES, /* scan 48-4F */
+	ES,  ES,  ES,  ES,   0,   0,  AS,   0, /* scan 50-57 */
+	 0,   0,   0,   0,   0,   0,   0,   0, /* scan 58-5F */
+	 0,   0,   0,   0,   0,   0,   0,   0, /* scan 60-67 */
+	 0,   0,   0,   0,   0,   0,   0,   0, /* scan 68-6F */
+	AS,   0,   0,  AS,   0,   0,  AS,   0, /* scan 70-77 */
+	 0,  AS,   0,   0,   0,  AS,   0,   0, /* scan 78-7F */
+	AS,  CN,  AS,  AS,  AK,  ST,  EX,  EX, /* enhanced */
+	AS,  EX,  EX,  AS,  EX,  AS,  EX,  EX  /* enhanced */
+	};
+
+static unsigned char kbd_key_map[2][5][144] = {
+	{ /* US keyboard */
+	{ /* unshift code */
+	   0, 0x1b,  '1',  '2',  '3',  '4',  '5',  '6', /* scan  0- 7 */
+	 '7',  '8',  '9',  '0',  '-',  '=', 0x08, '\t', /* scan  8- F */
+	 'q',  'w',  'e',  'r',  't',  'y',  'u',  'i', /* scan 10-17 */
+	 'o',  'p',  '[',  ']', '\r',   CN,  'a',  's', /* scan 18-1F */
+	 'd',  'f',  'g',  'h',  'j',  'k',  'l',  ';', /* scan 20-27 */
+	'\'',  '`',   SH, '\\',  'z',  'x',  'c',  'v', /* scan 28-2F */
+	 'b',  'n',  'm',  ',',  '.',  '/',   SH,  '*', /* scan 30-37 */
+	 ' ',  ' ',   CP,    0,    0,    0,    0,    0, /* scan 38-3F */
+	   0,    0,    0,    0,    0,   NM,   ST,  '7', /* scan 40-47 */
+	 '8',  '9',  '-',  '4',  '5',  '6',  '+',  '1', /* scan 48-4F */
+	 '2',  '3',  '0',  '.',    0,    0,    0,    0, /* scan 50-57 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 58-5F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 60-67 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 68-6F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 70-77 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 78-7F */
+	'\r',   CN,  '/',  '*',  ' ',   ST,  'F',  'A', /* extended */
+	   0,  'D',  'C',    0,  'B',    0,  '@',  'P'  /* extended */
+	},
+	{ /* shift code */
+	   0, 0x1b,  '!',  '@',  '#',  '$',  '%',  '^', /* scan  0- 7 */
+	 '&',  '*',  '(',  ')',  '_',  '+', 0x08, '\t', /* scan  8- F */
+	 'Q',  'W',  'E',  'R',  'T',  'Y',  'U',  'I', /* scan 10-17 */
+	 'O',  'P',  '{',  '}', '\r',   CN,  'A',  'S', /* scan 18-1F */
+	 'D',  'F',  'G',  'H',  'J',  'K',  'L',  ':', /* scan 20-27 */
+	 '"',  '~',   SH,  '|',  'Z',  'X',  'C',  'V', /* scan 28-2F */
+	 'B',  'N',  'M',  '<',  '>',  '?',   SH,  '*', /* scan 30-37 */
+	 ' ',  ' ',   CP,    0,    0,    0,    0,    0, /* scan 38-3F */
+	   0,    0,    0,    0,    0,   NM,   ST,  '7', /* scan 40-47 */
+	 '8',  '9',  '-',  '4',  '5',  '6',  '+',  '1', /* scan 48-4F */
+	 '2',  '3',  '0',  '.',    0,    0,    0,    0, /* scan 50-57 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 58-5F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 60-67 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 68-6F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 70-77 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 78-7F */
+	'\r',   CN,  '/',  '*',  ' ',   ST,  'F',  'A', /* extended */
+	   0,  'D',  'C',    0,  'B',    0,  '@',  'P'  /* extended */
+	},
+	{ /* control code */
+	0xff, 0x1b, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, /* scan  0- 7 */
+	0x1e, 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, '\t', /* scan  8- F */
+	0x11, 0x17, 0x05, 0x12, 0x14, 0x19, 0x15, 0x09, /* scan 10-17 */
+	0x0f, 0x10, 0x1b, 0x1d, '\r',   CN, 0x01, 0x13, /* scan 18-1F */
+	0x04, 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0c, 0xff, /* scan 20-27 */
+	0xff, 0x1c,   SH, 0xff, 0x1a, 0x18, 0x03, 0x16, /* scan 28-2F */
+	0x02, 0x0e, 0x0d, 0xff, 0xff, 0xff,   SH, 0xff, /* scan 30-37 */
+	0xff, 0xff,   CP, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 38-3F */
+	0xff, 0xff, 0xff, 0xff, 0xff,   NM,   ST, 0xff, /* scan 40-47 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 48-4F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 50-57 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 58-5F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 60-67 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 68-6F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 70-77 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 78-7F */
+	'\r',   CN,  '/',  '*',  ' ',   ST, 0xff, 0xff, /* extended */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  /* extended */
+	},
+	{ /* non numeric code */
+	   0, 0x1b,  '1',  '2',  '3',  '4',  '5',  '6', /* scan  0- 7 */
+	 '7',  '8',  '9',  '0',  '-',  '=', 0x08, '\t', /* scan  8- F */
+	 'q',  'w',  'e',  'r',  't',  'y',  'u',  'i', /* scan 10-17 */
+	 'o',  'p',  '[',  ']', '\r',   CN,  'a',  's', /* scan 18-1F */
+	 'd',  'f',  'g',  'h',  'j',  'k',  'l',  ';', /* scan 20-27 */
+	'\'',  '`',   SH, '\\',  'z',  'x',  'c',  'v', /* scan 28-2F */
+	 'b',  'n',  'm',  ',',  '.',  '/',   SH,  '*', /* scan 30-37 */
+	 ' ',  ' ',   CP,    0,    0,    0,    0,    0, /* scan 38-3F */
+	   0,    0,    0,    0,    0,   NM,   ST,  'w', /* scan 40-47 */
+	 'x',  'y',  'l',  't',  'u',  'v',  'm',  'q', /* scan 48-4F */
+	 'r',  's',  'p',  'n',    0,    0,    0,    0, /* scan 50-57 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 58-5F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 60-67 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 68-6F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 70-77 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 78-7F */
+	'\r',   CN,  '/',  '*',  ' ',   ST,  'F',  'A', /* extended */
+	   0,  'D',  'C',    0,  'B',    0,  '@',  'P'  /* extended */
+	},
+	{ /* right alt mode - not used in US keyboard */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan  0 - 7 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 8 - F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 10 -17 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 18 -1F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 20 -27 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 28 -2F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 30 -37 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 38 -3F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 40 -47 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 48 -4F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 50 -57 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 58 -5F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 60 -67 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 68 -6F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 70 -77 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 78 -7F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* extended */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  /* extended */
+	}
+	},
+	{ /* german keyboard */
+	{ /* unshift code */
+	   0, 0x1b,  '1',  '2',  '3',  '4',  '5',  '6', /* scan  0- 7 */
+	 '7',  '8',  '9',  '0', 0xe1, '\'', 0x08, '\t', /* scan  8- F */
+	 'q',  'w',  'e',  'r',  't',  'z',  'u',  'i', /* scan 10-17 */
+	 'o',  'p', 0x81,  '+', '\r',   CN,  'a',  's', /* scan 18-1F */
+	 'd',  'f',  'g',  'h',  'j',  'k',  'l', 0x94, /* scan 20-27 */
+	0x84,  '^',   SH,  '#',  'y',  'x',  'c',  'v', /* scan 28-2F */
+	 'b',  'n',  'm',  ',',  '.',  '-',   SH,  '*', /* scan 30-37 */
+	 ' ',  ' ',   CP,    0,    0,    0,    0,    0, /* scan 38-3F */
+	   0,    0,    0,    0,    0,   NM,   ST,  '7', /* scan 40-47 */
+	 '8',  '9',  '-',  '4',  '5',  '6',  '+',  '1', /* scan 48-4F */
+	 '2',  '3',  '0',  ',',    0,    0,  '<',    0, /* scan 50-57 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 58-5F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 60-67 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 68-6F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 70-77 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 78-7F */
+	'\r',   CN,  '/',  '*',  ' ',   ST,  'F',  'A', /* extended */
+	   0,  'D',  'C',    0,  'B',    0,  '@',  'P'  /* extended */
+	},
+	{ /* shift code */
+	   0, 0x1b,  '!',  '"', 0x15,  '$',  '%',  '&', /* scan  0- 7 */
+	 '/',  '(',  ')',  '=',  '?',  '`', 0x08, '\t', /* scan  8- F */
+	 'Q',  'W',  'E',  'R',  'T',  'Z',  'U',  'I', /* scan 10-17 */
+	 'O',  'P', 0x9a,  '*', '\r',   CN,  'A',  'S', /* scan 18-1F */
+	 'D',  'F',  'G',  'H',  'J',  'K',  'L', 0x99, /* scan 20-27 */
+	0x8e, 0xf8,   SH, '\'',  'Y',  'X',  'C',  'V', /* scan 28-2F */
+	 'B',  'N',  'M',  ';',  ':',  '_',   SH,  '*', /* scan 30-37 */
+	 ' ',  ' ',   CP,    0,    0,    0,    0,    0, /* scan 38-3F */
+	   0,    0,    0,    0,    0,   NM,   ST,  '7', /* scan 40-47 */
+	 '8',  '9',  '-',  '4',  '5',  '6',  '+',  '1', /* scan 48-4F */
+	 '2',  '3',  '0',  ',',    0,    0,  '>',    0, /* scan 50-57 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 58-5F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 60-67 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 68-6F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 70-77 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 78-7F */
+	'\r',   CN,  '/',  '*',  ' ',   ST,  'F',  'A', /* extended */
+	   0,  'D',  'C',    0,  'B',    0,  '@',  'P'  /* extended */
+	},
+	{ /* control code */
+	0xff, 0x1b, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, /* scan  0- 7 */
+	0x1e, 0xff, 0xff, 0xff, 0x1f, 0xff, 0xff, '\t', /* scan  8- F */
+	0x11, 0x17, 0x05, 0x12, 0x14, 0x19, 0x15, 0x09, /* scan 10-17 */
+	0x0f, 0x10, 0x1b, 0x1d, '\r',   CN, 0x01, 0x13, /* scan 18-1F */
+	0x04, 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0c, 0xff, /* scan 20-27 */
+	0xff, 0x1c,   SH, 0xff, 0x1a, 0x18, 0x03, 0x16, /* scan 28-2F */
+	0x02, 0x0e, 0x0d, 0xff, 0xff, 0xff,   SH, 0xff, /* scan 30-37 */
+	0xff, 0xff,   CP, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 38-3F */
+	0xff, 0xff, 0xff, 0xff, 0xff,   NM,   ST, 0xff, /* scan 40-47 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 48-4F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 50-57 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 58-5F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 60-67 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 68-6F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 70-77 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 78-7F */
+	'\r',   CN,  '/',  '*',  ' ',   ST, 0xff, 0xff, /* extended */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  /* extended */
+	},
+	{ /* non numeric code */
+	   0, 0x1b,  '1',  '2',  '3',  '4',  '5',  '6', /* scan  0- 7 */
+	 '7',  '8',  '9',  '0', 0xe1, '\'', 0x08, '\t', /* scan  8- F */
+	 'q',  'w',  'e',  'r',  't',  'z',  'u',  'i', /* scan 10-17 */
+	 'o',  'p', 0x81,  '+', '\r',   CN,  'a',  's', /* scan 18-1F */
+	 'd',  'f',  'g',  'h',  'j',  'k',  'l', 0x94, /* scan 20-27 */
+	0x84,  '^',   SH,    0,  'y',  'x',  'c',  'v', /* scan 28-2F */
+	 'b',  'n',  'm',  ',',  '.',  '-',   SH,  '*', /* scan 30-37 */
+	 ' ',  ' ',   CP,    0,    0,    0,    0,    0, /* scan 38-3F */
+	   0,    0,    0,    0,    0,   NM,   ST,  'w', /* scan 40-47 */
+	 'x',  'y',  'l',  't',  'u',  'v',  'm',  'q', /* scan 48-4F */
+	 'r',  's',  'p',  'n',    0,    0,  '<',    0, /* scan 50-57 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 58-5F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 60-67 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 68-6F */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 70-77 */
+	   0,    0,    0,    0,    0,    0,    0,    0, /* scan 78-7F */
+	'\r',   CN,  '/',  '*',  ' ',   ST,  'F',  'A', /* extended */
+	   0,  'D',  'C',    0,  'B',    0,  '@',  'P'  /* extended */
+	},
+	{ /* Right alt mode - is used in German keyboard */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan  0 - 7 */
+	 '{',  '[',  ']',  '}', '\\', 0xff, 0xff, 0xff, /* scan  8 - F */
+	 '@', 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 10 -17 */
+	0xff, 0xff, 0xff,  '~', 0xff, 0xff, 0xff, 0xff, /* scan 18 -1F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 20 -27 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 28 -2F */
+	0xff, 0xff, 0xe6, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 30 -37 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 38 -3F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 40 -47 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 48 -4F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff,  '|', 0xff, /* scan 50 -57 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 58 -5F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 60 -67 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 68 -6F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 70 -77 */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* scan 78 -7F */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* extended */
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff  /* extended */
+	}
+	}
+	};
+
+static unsigned char ext_key_map[] = {
+	0x1c, /* keypad enter */
+	0x1d, /* right control */
+	0x35, /* keypad slash */
+	0x37, /* print screen */
+	0x38, /* right alt */
+	0x46, /* break */
+	0x47, /* editpad home */
+	0x48, /* editpad up */
+	0x49, /* editpad pgup */
+	0x4b, /* editpad left */
+	0x4d, /* editpad right */
+	0x4f, /* editpad end */
+	0x50, /* editpad dn */
+	0x51, /* editpad pgdn */
+	0x52, /* editpad ins */
+	0x53, /* editpad del */
+	0x00  /* map end */
+	};
+
+/******************************************************************************/
+
+static int kbd_controller_present(void)
+{
+	return in8(I8042_STATUS_REG) != 0xff;
+}
 
 /*******************************************************************************
  *
  * i8042_kbd_init - reset keyboard and init state flags
  */
-int i8042_kbd_init (void)
+int i8042_kbd_init(void)
 {
-    int keymap, try;
-    char *penv;
+	int keymap, try;
+	char *penv;
+
+	if (!kbd_controller_present())
+		return -1;
 
 #ifdef CONFIG_USE_CPCIDVI
-    if ((penv = getenv ("console")) != NULL) {
-	    if (strncmp (penv, "serial", 7) == 0) {
-		    return -1;
-	    }
-    }
+	penv = getenv("console");
+	if (penv != NULL) {
+		if (strncmp(penv, "serial", 7) == 0)
+			return -1;
+	}
 #endif
-    /* Init keyboard device (default US layout) */
-    keymap = KBD_US;
-    if ((penv = getenv ("keymap")) != NULL)
-    {
-	if (strncmp (penv, "de", 3) == 0)
-	keymap = KBD_GER;
-    }
-
-    for (try = 0; try < KBD_RESET_TRIES; try++)
-    {
-	if (kbd_reset() == 0)
-	{
-	    kbd_mapping	  = keymap;
-	    kbd_flags	  = NORMAL;
-	    kbd_state	  = 0;
-	    kbd_led_set();
-	    return 0;
-	    }
-    }
-    return -1;
+	/* Init keyboard device (default US layout) */
+	keymap = KBD_US;
+	penv = getenv("keymap");
+	if (penv != NULL) {
+		if (strncmp(penv, "de", 3) == 0)
+			keymap = KBD_GER;
+	}
+
+	for (try = 0; try < KBD_RESET_TRIES; try++) {
+		if (kbd_reset() == 0) {
+			kbd_mapping = keymap;
+			kbd_flags   = NORMAL;
+			kbd_state   = 0;
+			kbd_led_set();
+			return 0;
+		}
+	}
+	return -1;
 }
 
 
@@ -359,34 +365,32 @@ int i8042_kbd_init (void)
  * i8042_tstc - test if keyboard input is available
  *		option: cursor blinking if called in a loop
  */
-int i8042_tstc (void)
+int i8042_tstc(void)
 {
-    unsigned char scan_code = 0;
+	unsigned char scan_code = 0;
 
 #ifdef CONFIG_CONSOLE_CURSOR
-    if (--blinkCount == 0)
-    {
-	cursor_state ^= 1;
-	console_cursor (cursor_state);
-	blinkCount = CONFIG_SYS_CONSOLE_BLINK_COUNT;
-	udelay (10);
-    }
+	if (--blinkCount == 0) {
+		cursor_state ^= 1;
+		console_cursor(cursor_state);
+		blinkCount = CONFIG_SYS_CONSOLE_BLINK_COUNT;
+		udelay(10);
+	}
 #endif
 
-    if ((in8 (I8042_STATUS_REG) & 0x01) == 0)
+	if ((in8(I8042_STATUS_REG) & 0x01) == 0) {
+		return 0;
+	} else {
+		scan_code = in8(I8042_DATA_REG);
+		if (scan_code == 0xfa)
+			return 0;
+
+		kbd_conv_char(scan_code);
+
+		if (kbd_input != -1)
+			return 1;
+	}
 	return 0;
-    else
-    {
-	scan_code = in8 (I8042_DATA_REG);
-	if (scan_code == 0xfa)
-	    return 0;
-
-	kbd_conv_char(scan_code);
-
-	if (kbd_input != -1)
-	    return 1;
-    }
-    return 0;
 }
 
 
@@ -395,276 +399,256 @@ int i8042_tstc (void)
  * i8042_getc - wait till keyboard input is available
  *		option: turn on/off cursor while waiting
  */
-int i8042_getc (void)
+int i8042_getc(void)
 {
-    int ret_chr;
-    unsigned char scan_code;
+	int ret_chr;
+	unsigned char scan_code;
 
-    while (kbd_input == -1)
-    {
-	while ((in8 (I8042_STATUS_REG) & 0x01) == 0)
-	{
+	while (kbd_input == -1) {
+		while ((in8(I8042_STATUS_REG) & 0x01) == 0) {
 #ifdef CONFIG_CONSOLE_CURSOR
-	    if (--blinkCount==0)
-	    {
-		cursor_state ^= 1;
-		console_cursor (cursor_state);
-		blinkCount = CONFIG_SYS_CONSOLE_BLINK_COUNT;
-	    }
-	    udelay (10);
+			if (--blinkCount == 0) {
+				cursor_state ^= 1;
+				console_cursor(cursor_state);
+				blinkCount = CONFIG_SYS_CONSOLE_BLINK_COUNT;
+			}
+			udelay(10);
 #endif
+		}
+		scan_code = in8(I8042_DATA_REG);
+		if (scan_code != 0xfa)
+			kbd_conv_char (scan_code);
 	}
-
-	scan_code = in8 (I8042_DATA_REG);
-
-	if (scan_code != 0xfa)
-	kbd_conv_char (scan_code);
-    }
-    ret_chr = kbd_input;
-    kbd_input = -1;
-    return ret_chr;
+	ret_chr = kbd_input;
+	kbd_input = -1;
+	return ret_chr;
 }
 
 
 /******************************************************************************/
 
-static void kbd_conv_char (unsigned char scan_code)
+static void kbd_conv_char(unsigned char scan_code)
 {
-    if (scan_code == 0xe0)
-    {
-	kbd_flags |= EXT;
-	return;
-    }
-
-    /* if high bit of scan_code, set break flag */
-    if (scan_code & 0x80)
-	kbd_flags |=  BRK;
-    else
-	kbd_flags &= ~BRK;
-
-    if ((scan_code == 0xe1) || (kbd_flags & E1))
-    {
-	if (scan_code == 0xe1)
-	{
-	    kbd_flags ^= BRK;	  /* reset the break flag */
-	    kbd_flags ^= E1;	  /* bitwise EXOR with E1 flag */
+	if (scan_code == 0xe0) {
+		kbd_flags |= EXT;
+		return;
 	}
-	return;
-    }
 
-    scan_code &= 0x7f;
+	/* if high bit of scan_code, set break flag */
+	if (scan_code & 0x80)
+		kbd_flags |=  BRK;
+	else
+		kbd_flags &= ~BRK;
+
+	if ((scan_code == 0xe1) || (kbd_flags & E1)) {
+		if (scan_code == 0xe1) {
+			kbd_flags ^= BRK;    /* reset the break flag */
+			kbd_flags ^= E1;     /* bitwise EXOR with E1 flag */
+		}
+		return;
+	}
 
-    if (kbd_flags & EXT)
-    {
-	int i;
+	scan_code &= 0x7f;
+
+	if (kbd_flags & EXT) {
+		int i;
+
+		kbd_flags ^= EXT;
+		for (i = 0; ext_key_map[i]; i++) {
+			if (ext_key_map[i] == scan_code) {
+				scan_code = 0x80 + i;
+				break;
+			}
+		}
+		/* not found ? */
+		if (!ext_key_map[i])
+			return;
+	}
 
-	kbd_flags ^= EXT;
-	for (i=0; ext_key_map[i]; i++)
-	{
-	    if (ext_key_map[i] == scan_code)
-	    {
-		scan_code = 0x80 + i;
+	switch (kbd_fct_map[scan_code]) {
+	case AS:
+		kbd_normal(scan_code);
+		break;
+	case SH:
+		kbd_shift(scan_code);
+		break;
+	case CN:
+		kbd_ctrl(scan_code);
+		break;
+	case NM:
+		kbd_num(scan_code);
+		break;
+	case CP:
+		kbd_caps(scan_code);
+		break;
+	case ST:
+		kbd_scroll(scan_code);
+		break;
+	case AK:
+		kbd_alt(scan_code);
 		break;
-	    }
 	}
-	/* not found ? */
-	if (!ext_key_map[i])
-	    return;
-    }
-
-    switch (kbd_fct_map [scan_code])
-    {
-    case AS:  kbd_normal (scan_code);
-	break;
-    case SH:  kbd_shift (scan_code);
-	break;
-    case CN:  kbd_ctrl (scan_code);
-	break;
-    case NM:  kbd_num (scan_code);
-	break;
-    case CP:  kbd_caps (scan_code);
-	break;
-    case ST:  kbd_scroll (scan_code);
-	break;
-    case AK:  kbd_alt (scan_code);
-	break;
-    }
-    return;
+	return;
 }
 
 
 /******************************************************************************/
 
-static void kbd_normal (unsigned char scan_code)
+static void kbd_normal(unsigned char scan_code)
 {
-    unsigned char chr;
-
-    if ((kbd_flags & BRK) == NORMAL)
-    {
-       chr = kbd_key_map [kbd_mapping][kbd_state][scan_code];
-       if ((chr == 0xff) || (chr == 0x00))
-	{
-	    return;
+	unsigned char chr;
+
+	if ((kbd_flags & BRK) == NORMAL) {
+		chr = kbd_key_map[kbd_mapping][kbd_state][scan_code];
+		if ((chr == 0xff) || (chr == 0x00))
+			return;
+
+		/* if caps lock convert upper to lower */
+		if (((kbd_flags & CAPS) == CAPS) &&
+				(chr >= 'a' && chr <= 'z')) {
+			chr -= 'a' - 'A';
+		}
+		kbd_input = chr;
 	}
-
-	/* if caps lock convert upper to lower */
-	if (((kbd_flags & CAPS) == CAPS) && (chr >= 'a' && chr <= 'z'))
-       {
-	   chr -= 'a' - 'A';
-       }
-       kbd_input = chr;
-    }
 }
 
 
 /******************************************************************************/
 
-static void kbd_shift (unsigned char scan_code)
+static void kbd_shift(unsigned char scan_code)
 {
-    if ((kbd_flags & BRK) == BRK)
-    {
-	kbd_state = AS;
-	kbd_flags &= (~SHIFT);
-    }
-    else
-    {
-       kbd_state = SH;
-       kbd_flags |= SHIFT;
-    }
+	if ((kbd_flags & BRK) == BRK) {
+		kbd_state = AS;
+		kbd_flags &= (~SHIFT);
+	} else {
+		kbd_state = SH;
+		kbd_flags |= SHIFT;
+	}
 }
 
 
 /******************************************************************************/
 
-static void kbd_ctrl (unsigned char scan_code)
+static void kbd_ctrl(unsigned char scan_code)
 {
-    if ((kbd_flags & BRK) == BRK)
-    {
-       kbd_state = AS;
-       kbd_flags &= (~CTRL);
-    }
-    else
-    {
-       kbd_state = CN;
-       kbd_flags |= CTRL;
-    }
+	if ((kbd_flags & BRK) == BRK) {
+		kbd_state = AS;
+		kbd_flags &= (~CTRL);
+	} else {
+		kbd_state = CN;
+		kbd_flags |= CTRL;
+	}
 }
 
 
 /******************************************************************************/
 
-static void kbd_caps (unsigned char scan_code)
+static void kbd_caps(unsigned char scan_code)
 {
-    if ((kbd_flags & BRK) == NORMAL)
-    {
-       kbd_flags ^= CAPS;
-       kbd_led_set ();		  /* update keyboard LED */
-    }
+	if ((kbd_flags & BRK) == NORMAL) {
+		kbd_flags ^= CAPS;
+		kbd_led_set();    /* update keyboard LED */
+	}
 }
 
 
 /******************************************************************************/
 
-static void kbd_num (unsigned char scan_code)
+static void kbd_num(unsigned char scan_code)
 {
-    if ((kbd_flags & BRK) == NORMAL)
-    {
-       kbd_flags ^= NUM;
-       kbd_state = (kbd_flags & NUM) ? AS : NM;
-       kbd_led_set ();		  /* update keyboard LED */
-    }
+	if ((kbd_flags & BRK) == NORMAL) {
+		kbd_flags ^= NUM;
+		kbd_state = (kbd_flags & NUM) ? AS : NM;
+		kbd_led_set();    /* update keyboard LED */
+	}
 }
 
 
 /******************************************************************************/
 
-static void kbd_scroll (unsigned char scan_code)
+static void kbd_scroll(unsigned char scan_code)
 {
-    if ((kbd_flags & BRK) == NORMAL)
-    {
-	kbd_flags ^= STP;
-	kbd_led_set ();		   /* update keyboard LED */
-	if (kbd_flags & STP)
-	    kbd_input = 0x13;
-	else
-	    kbd_input = 0x11;
-    }
+	if ((kbd_flags & BRK) == NORMAL) {
+		kbd_flags ^= STP;
+		kbd_led_set();    /* update keyboard LED */
+		if (kbd_flags & STP)
+			kbd_input = 0x13;
+		else
+			kbd_input = 0x11;
+	}
 }
 
 /******************************************************************************/
 
-static void kbd_alt (unsigned char scan_code)
+static void kbd_alt(unsigned char scan_code)
 {
-    if ((kbd_flags & BRK) == BRK)
-    {
-	kbd_state = AS;
-	kbd_flags &= (~ALT);
-    }
-    else
-    {
-	kbd_state = AK;
-	kbd_flags &= ALT;
-    }
+	if ((kbd_flags & BRK) == BRK) {
+		kbd_state = AS;
+		kbd_flags &= (~ALT);
+	} else {
+		kbd_state = AK;
+		kbd_flags &= ALT;
+	}
 }
 
 
 /******************************************************************************/
 
-static void kbd_led_set (void)
+static void kbd_led_set(void)
 {
-    kbd_input_empty();
-    out8 (I8042_DATA_REG, 0xed);	/* SET LED command */
-    kbd_input_empty();
-    out8 (I8042_DATA_REG, (kbd_flags & 0x7));	 /* LED bits only */
+	kbd_input_empty();
+	out8(I8042_DATA_REG, 0xed);    /* SET LED command */
+	kbd_input_empty();
+	out8(I8042_DATA_REG, (kbd_flags & 0x7));    /* LED bits only */
 }
 
 
 /******************************************************************************/
 
-static int kbd_input_empty (void)
+static int kbd_input_empty(void)
 {
-    int kbdTimeout = KBD_TIMEOUT;
+	int kbdTimeout = KBD_TIMEOUT;
 
-    /* wait for input buf empty */
-    while ((in8 (I8042_STATUS_REG) & 0x02) && kbdTimeout--)
-	udelay(1000);
+	/* wait for input buf empty */
+	while ((in8(I8042_STATUS_REG) & 0x02) && kbdTimeout--)
+		udelay(1000);
 
-    return kbdTimeout;
+	return kbdTimeout != -1;
 }
 
 /******************************************************************************/
 
-static int kbd_reset (void)
+static int kbd_reset(void)
 {
-    if (kbd_input_empty() == 0)
-	return -1;
+	if (kbd_input_empty() == 0)
+		return -1;
 
-    out8 (I8042_DATA_REG, 0xff);
+	out8(I8042_DATA_REG, 0xff);
 
-    udelay(250000);
+	udelay(250000);
 
-    if (kbd_input_empty() == 0)
-	return -1;
+	if (kbd_input_empty() == 0)
+		return -1;
 
 #ifdef CONFIG_USE_CPCIDVI
-    out8 (I8042_COMMAND_REG, 0x60);
+	out8(I8042_COMMAND_REG, 0x60);
 #else
-    out8 (I8042_DATA_REG, 0x60);
+	out8(I8042_DATA_REG, 0x60);
 #endif
 
-    if (kbd_input_empty() == 0)
-	return -1;
+	if (kbd_input_empty() == 0)
+		return -1;
 
-    out8 (I8042_DATA_REG, 0x45);
+	out8(I8042_DATA_REG, 0x45);
 
 
-    if (kbd_input_empty() == 0)
-	return -1;
+	if (kbd_input_empty() == 0)
+		return -1;
 
-    out8 (I8042_COMMAND_REG, 0xae);
+	out8(I8042_COMMAND_REG, 0xae);
 
-    if (kbd_input_empty() == 0)
-	return -1;
+	if (kbd_input_empty() == 0)
+		return -1;
 
-    return 0;
+	return 0;
 }
diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c
index 846c372..0b8c33f 100644
--- a/drivers/net/fm/fm.c
+++ b/drivers/net/fm/fm.c
@@ -25,11 +25,11 @@
 #include "fm.h"
 #include "../../qe/qe.h"		/* For struct qe_firmware */
 
-#ifdef CONFIG_SYS_QE_FW_IN_NAND
+#ifdef CONFIG_SYS_QE_FMAN_FW_IN_NAND
 #include <nand.h>
 #elif defined(CONFIG_SYS_QE_FW_IN_SPIFLASH)
 #include <spi_flash.h>
-#elif defined(CONFIG_SYS_QE_FW_IN_MMC)
+#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_MMC)
 #include <mmc.h>
 #endif
 
@@ -363,21 +363,21 @@ int fm_init_common(int index, struct ccsr_fman *reg)
 {
 	int rc;
 	char env_addr[32];
-#if defined(CONFIG_SYS_FMAN_FW_ADDR)
-	void *addr = (void *)CONFIG_SYS_FMAN_FW_ADDR;
-#elif defined(CONFIG_SYS_QE_FW_IN_NAND)
-	size_t fw_length = CONFIG_SYS_FMAN_FW_LENGTH;
-	void *addr = malloc(CONFIG_SYS_FMAN_FW_LENGTH);
+#if defined(CONFIG_SYS_QE_FMAN_FW_IN_NOR)
+	void *addr = (void *)CONFIG_SYS_QE_FMAN_FW_ADDR;
+#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_NAND)
+	size_t fw_length = CONFIG_SYS_QE_FMAN_FW_LENGTH;
+	void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH);
 
-	rc = nand_read(&nand_info[0], (loff_t)CONFIG_SYS_QE_FW_IN_NAND,
+	rc = nand_read(&nand_info[0], (loff_t)CONFIG_SYS_QE_FMAN_FW_ADDR,
 		       &fw_length, (u_char *)addr);
 	if (rc == -EUCLEAN) {
 		printf("NAND read of FMAN firmware at offset 0x%x failed %d\n",
-			CONFIG_SYS_QE_FW_IN_NAND, rc);
+			CONFIG_SYS_QE_FMAN_FW_ADDR, rc);
 	}
 #elif defined(CONFIG_SYS_QE_FW_IN_SPIFLASH)
 	struct spi_flash *ucode_flash;
-	void *addr = malloc(CONFIG_SYS_FMAN_FW_LENGTH);
+	void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH);
 	int ret = 0;
 
 	ucode_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
@@ -385,17 +385,17 @@ int fm_init_common(int index, struct ccsr_fman *reg)
 	if (!ucode_flash)
 		printf("SF: probe for ucode failed\n");
 	else {
-		ret = spi_flash_read(ucode_flash, CONFIG_SYS_QE_FW_IN_SPIFLASH,
-				CONFIG_SYS_FMAN_FW_LENGTH, addr);
+		ret = spi_flash_read(ucode_flash, CONFIG_SYS_QE_FMAN_FW_ADDR,
+				CONFIG_SYS_QE_FMAN_FW_LENGTH, addr);
 		if (ret)
 			printf("SF: read for ucode failed\n");
 		spi_flash_free(ucode_flash);
 	}
-#elif defined(CONFIG_SYS_QE_FW_IN_MMC)
+#elif defined(CONFIG_SYS_QE_FMAN_FW_IN_MMC)
 	int dev = CONFIG_SYS_MMC_ENV_DEV;
-	void *addr = malloc(CONFIG_SYS_FMAN_FW_LENGTH);
-	u32 cnt = CONFIG_SYS_FMAN_FW_LENGTH / 512;
-	u32 blk = CONFIG_SYS_QE_FW_IN_MMC / 512;
+	void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH);
+	u32 cnt = CONFIG_SYS_QE_FMAN_FW_LENGTH / 512;
+	u32 blk = CONFIG_SYS_QE_FMAN_FW_ADDR / 512;
 	struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
 
 	if (!mmc)
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c
index c4ec2f4..9f71151 100644
--- a/drivers/qe/qe.c
+++ b/drivers/qe/qe.c
@@ -170,11 +170,11 @@ void qe_init(uint qe_base)
 	/* Init the QE IMMR base */
 	qe_immr = (qe_map_t *)qe_base;
 
-#ifdef CONFIG_SYS_QE_FW_ADDR
+#ifdef CONFIG_SYS_QE_FMAN_FW_IN_NOR
 	/*
 	 * Upload microcode to IRAM for those SOCs which do not have ROM in QE.
 	 */
-	qe_upload_firmware((const struct qe_firmware *) CONFIG_SYS_QE_FW_ADDR);
+	qe_upload_firmware((const void *)CONFIG_SYS_QE_FMAN_FW_ADDR);
 
 	/* enable the microcode in IRAM */
 	out_be32(&qe_immr->iram.iready,QE_IRAM_READY);
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index c713d42..bb27dd5 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -550,11 +550,12 @@ static int sl811_rh_submit_urb(struct usb_device *usb_dev, unsigned long pipe,
 	__u8 *bufp = data_buf;
 	int len = 0;
 	int status = 0;
-
 	__u16 bmRType_bReq;
-	__u16 wValue;
-	__u16 wIndex;
-	__u16 wLength;
+	__u16 wValue  = le16_to_cpu (cmd->value);
+	__u16 wLength = le16_to_cpu (cmd->length);
+#ifdef SL811_DEBUG
+	__u16 wIndex  = le16_to_cpu (cmd->index);
+#endif
 
 	if (usb_pipeint(pipe)) {
 		PDEBUG(0, "interrupt transfer unimplemented!\n");
@@ -562,9 +563,6 @@ static int sl811_rh_submit_urb(struct usb_device *usb_dev, unsigned long pipe,
 	}
 
 	bmRType_bReq  = cmd->requesttype | (cmd->request << 8);
-	wValue	      = le16_to_cpu (cmd->value);
-	wIndex	      = le16_to_cpu (cmd->index);
-	wLength	      = le16_to_cpu (cmd->length);
 
 	PDEBUG(5, "submit rh urb, req = %d(%x) val = %#x index = %#x len=%d\n",
 	       bmRType_bReq, bmRType_bReq, wValue, wIndex, wLength);