summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-08-26 17:48:05 -0400
committerTom Rini <trini@konsulko.com>2015-08-26 17:48:05 -0400
commit79c884d7e449a63fa8f07b7495f8f9873355c48f (patch)
tree19adcc1b9d3520a68937a1f5f81b06775c790d8a /include
parentad608a21f89bf7467059ed59d60b080aace7ef99 (diff)
parentf4b5db7c5309dd7f3ecc6369f3c1f41e8bfe93ae (diff)
downloadu-boot-imx-79c884d7e449a63fa8f07b7495f8f9873355c48f.zip
u-boot-imx-79c884d7e449a63fa8f07b7495f8f9873355c48f.tar.gz
u-boot-imx-79c884d7e449a63fa8f07b7495f8f9873355c48f.tar.bz2
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
-rw-r--r--include/configs/bayleybay.h1
-rw-r--r--include/configs/crownbay.h4
-rw-r--r--include/configs/minnowmax.h1
-rw-r--r--include/configs/qemu-x86.h1
-rw-r--r--include/configs/x86-common.h3
-rw-r--r--include/i8042.h103
-rw-r--r--include/pci.h1
-rw-r--r--include/smsc_lpc47m.h29
-rw-r--r--include/vbe.h2
9 files changed, 90 insertions, 55 deletions
diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h
index d37a865..1ba2998 100644
--- a/include/configs/bayleybay.h
+++ b/include/configs/bayleybay.h
@@ -16,7 +16,6 @@
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
#define CONFIG_ARCH_MISC_INIT
-#define CONFIG_PCI_CONFIG_HOST_BRIDGE
#define CONFIG_SYS_EARLY_PCI_INIT
#define CONFIG_PCI_PNP
diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h
index 57a9512..998da78 100644
--- a/include/configs/crownbay.h
+++ b/include/configs/crownbay.h
@@ -31,7 +31,6 @@
#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS
#define CONFIG_PCI_IO_SIZE 0xe000
-#define CONFIG_PCI_CONFIG_HOST_BRIDGE
#define CONFIG_SYS_EARLY_PCI_INIT
#define CONFIG_PCI_PNP
@@ -54,9 +53,6 @@
#define CONFIG_PCH_GBE
#define CONFIG_PHYLIB
-/* TunnelCreek IGD support */
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-
/* Environment configuration */
#define CONFIG_ENV_SECT_SIZE 0x1000
#define CONFIG_ENV_OFFSET 0
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index aeb04b9..53d86a2 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -19,7 +19,6 @@
#define CONFIG_SMSC_LPC47M
-#define CONFIG_PCI_CONFIG_HOST_BRIDGE
#define CONFIG_SYS_EARLY_PCI_INIT
#define CONFIG_PCI_PNP
#define CONFIG_RTL8169
diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
index 72df64e..1b544c1 100644
--- a/include/configs/qemu-x86.h
+++ b/include/configs/qemu-x86.h
@@ -28,7 +28,6 @@
#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS
#define CONFIG_PCI_IO_SIZE 0xe000
-#define CONFIG_PCI_CONFIG_HOST_BRIDGE
#define CONFIG_PCI_PNP
#define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,vga\0" \
diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index 349b06c..217312e 100644
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -87,7 +87,9 @@
#define CONFIG_ISO_PARTITION /* Experimental */
#define CONFIG_CMD_PART
+#ifdef CONFIG_SYS_COREBOOT
#define CONFIG_CMD_CBFS
+#endif
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_PARTITION_UUIDS
@@ -190,6 +192,7 @@
* PCI configuration
*/
#define CONFIG_PCI
+#define CONFIG_PCI_CONFIG_HOST_BRIDGE
/*-----------------------------------------------------------------------
* USB configuration
diff --git a/include/i8042.h b/include/i8042.h
index 58c85ec..e0afce1 100644
--- a/include/i8042.h
+++ b/include/i8042.h
@@ -10,52 +10,67 @@
#ifndef _I8042_H_
#define _I8042_H_
-#ifdef __I386__
-#include <common.h>
-#include <asm/io.h>
-#define in8(p) inb(p)
-#define out8(p,v) outb(v,p)
-#endif
-
/* defines */
-#define I8042_DATA_REG (CONFIG_SYS_ISA_IO + 0x0060) /* keyboard i/o buffer */
-#define I8042_STATUS_REG (CONFIG_SYS_ISA_IO + 0x0064) /* keyboard status read */
-#define I8042_COMMAND_REG (CONFIG_SYS_ISA_IO + 0x0064) /* keyboard ctrl write */
-
-enum {
- /* Output register (I8042_DATA_REG) has data for system */
- I8042_STATUS_OUT_DATA = 1 << 0,
- I8042_STATUS_IN_DATA = 1 << 1,
-};
-
-#define KBD_US 0 /* default US layout */
-#define KBD_GER 1 /* german layout */
-
-#define KBD_TIMEOUT 1000 /* 1 sec */
-#define KBD_RESET_TRIES 3
-
-#define AS 0 /* normal character index */
-#define SH 1 /* shift index */
-#define CN 2 /* control index */
-#define NM 3 /* numeric lock index */
-#define AK 4 /* right alt key */
-#define CP 5 /* capslock index */
-#define ST 6 /* stop output index */
-#define EX 7 /* extended code index */
-#define ES 8 /* escape and extended code index */
-
-#define NORMAL 0x0000 /* normal key */
-#define STP 0x0001 /* scroll lock stop output*/
-#define NUM 0x0002 /* numeric lock */
-#define CAPS 0x0004 /* capslock */
-#define SHIFT 0x0008 /* shift */
-#define CTRL 0x0010 /* control*/
-#define EXT 0x0020 /* extended scan code 0xe0 */
-#define ESC 0x0040 /* escape key press */
-#define E1 0x0080 /* extended scan code 0xe1 */
-#define BRK 0x0100 /* make break flag for keyboard */
-#define ALT 0x0200 /* right alt */
+#define I8042_DATA_REG 0x60 /* keyboard i/o buffer */
+#define I8042_STS_REG 0x64 /* keyboard status read */
+#define I8042_CMD_REG 0x64 /* keyboard ctrl write */
+
+/* Status register bit defines */
+#define STATUS_OBF (1 << 0)
+#define STATUS_IBF (1 << 1)
+
+/* Configuration byte bit defines */
+#define CONFIG_KIRQ_EN (1 << 0)
+#define CONFIG_MIRQ_EN (1 << 1)
+#define CONFIG_SET_BIST (1 << 2)
+#define CONFIG_KCLK_DIS (1 << 4)
+#define CONFIG_MCLK_DIS (1 << 5)
+#define CONFIG_AT_TRANS (1 << 6)
+
+/* i8042 commands */
+#define CMD_RD_CONFIG 0x20 /* read configuration byte */
+#define CMD_WR_CONFIG 0x60 /* write configuration byte */
+#define CMD_SELF_TEST 0xaa /* controller self-test */
+#define CMD_KBD_DIS 0xad /* keyboard disable */
+#define CMD_KBD_EN 0xae /* keyboard enable */
+#define CMD_SET_KBD_LED 0xed /* set keyboard led */
+#define CMD_RESET_KBD 0xff /* reset keyboard */
+
+/* i8042 command result */
+#define KBC_TEST_OK 0x55
+#define KBD_ACK 0xfa
+#define KBD_POR 0xaa
+
+/* keyboard scan codes */
+
+#define KBD_US 0 /* default US layout */
+#define KBD_GER 1 /* german layout */
+
+#define KBD_TIMEOUT 1000 /* 1 sec */
+#define KBD_RESET_TRIES 3
+
+#define AS 0 /* normal character index */
+#define SH 1 /* shift index */
+#define CN 2 /* control index */
+#define NM 3 /* numeric lock index */
+#define AK 4 /* right alt key */
+#define CP 5 /* capslock index */
+#define ST 6 /* stop output index */
+#define EX 7 /* extended code index */
+#define ES 8 /* escape and extended code index */
+
+#define NORMAL 0x0000 /* normal key */
+#define STP 0x0001 /* scroll lock stop output*/
+#define NUM 0x0002 /* numeric lock */
+#define CAPS 0x0004 /* capslock */
+#define SHIFT 0x0008 /* shift */
+#define CTRL 0x0010 /* control*/
+#define EXT 0x0020 /* extended scan code 0xe0 */
+#define ESC 0x0040 /* escape key press */
+#define E1 0x0080 /* extended scan code 0xe1 */
+#define BRK 0x0100 /* make break flag for keyboard */
+#define ALT 0x0200 /* right alt */
/* exports */
diff --git a/include/pci.h b/include/pci.h
index 488ff44..e24c970 100644
--- a/include/pci.h
+++ b/include/pci.h
@@ -653,6 +653,7 @@ extern pci_addr_t pci_hose_phys_to_bus(struct pci_controller* hose,
#define pci_io_to_virt(dev, addr, len, map_flags) \
pci_bus_to_virt((dev), (addr), PCI_REGION_IO, (len), (map_flags))
+/* For driver model these are defined in macros in pci_compat.c */
extern int pci_hose_read_config_byte(struct pci_controller *hose,
pci_dev_t dev, int where, u8 *val);
extern int pci_hose_read_config_word(struct pci_controller *hose,
diff --git a/include/smsc_lpc47m.h b/include/smsc_lpc47m.h
index 32b069d..419643f 100644
--- a/include/smsc_lpc47m.h
+++ b/include/smsc_lpc47m.h
@@ -7,14 +7,35 @@
#ifndef _SMSC_LPC47M_H_
#define _SMSC_LPC47M_H_
+/* I/O address of LPC47M */
+#define LPC47M_IO_PORT 0x2e
+
+/* Logical device number */
+#define LPC47M_FDC 0 /* Floppy */
+#define LPC47M_SP2 2 /* Serial Port 2 */
+#define LPC47M_PP 3 /* Parallel Port */
+#define LPC47M_SP1 4 /* Serial Port 1 */
+#define LPC47M_KBC 7 /* Keyboard & Mouse */
+#define LPC47M_PME 10 /* Power Control */
+
/**
* Configure the base I/O port of the specified serial device and enable the
* serial device.
*
- * @dev: High 8 bits = Super I/O port, low 8 bits = logical device number.
- * @iobase: Processor I/O port address to assign to this serial device.
- * @irq: Processor IRQ number to assign to this serial device.
+ * @dev: high 8 bits = super I/O port, low 8 bits = logical device number
+ * @iobase: processor I/O port address to assign to this serial device
+ * @irq: processor IRQ number to assign to this serial device
+ */
+void lpc47m_enable_serial(uint dev, uint iobase, uint irq);
+
+/**
+ * Configure the specified keyboard controller device and enable the keyboard
+ * controller device.
+ *
+ * @dev: high 8 bits = Super I/O port, low 8 bits = logical device number
+ * @irq0: processor IRQ number to assign to keyboard
+ * @irq1: processor IRQ number to assign to mouse
*/
-void lpc47m_enable_serial(u16 dev, u16 iobase, u8 irq);
+void lpc47m_enable_kbc(uint dev, uint irq0, uint irq1);
#endif /* _SMSC_LPC47M_H_ */
diff --git a/include/vbe.h b/include/vbe.h
index 1a86db8..164ccae 100644
--- a/include/vbe.h
+++ b/include/vbe.h
@@ -102,6 +102,8 @@ struct vbe_ddc_info {
#define VESA_SET_MODE 0x4f02
#define VESA_GET_CUR_MODE 0x4f03
+extern struct vbe_mode_info mode_info;
+
struct graphic_device;
int vbe_get_video_info(struct graphic_device *gdev);