diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-02-12 03:15:25 +0300 |
|---|---|---|
| committer | Andrzej Zaborowski <balrog@zabor.org> | 2011-02-16 02:04:51 +0100 |
| commit | 459505a2647a5197cb60ad48a05917f6d8e52695 (patch) | |
| tree | 4d1a6e39d76ad4e7f9b36019d237ba6164661b32 /hw | |
| parent | cb380f615c565804b83c16595185d308c8e1f0e1 (diff) | |
Merge mainstone.h header into mainstone.c
Now the only user of mainstone.h is mainstone.c file. Merge header
into board file.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/mainstone.c | 23 | ||||
| -rw-r--r-- | hw/mainstone.h | 35 |
2 files changed, 22 insertions, 36 deletions
diff --git a/hw/mainstone.c b/hw/mainstone.c index 04ce8e3d99..aec8d34b4f 100644 --- a/hw/mainstone.c +++ b/hw/mainstone.c @@ -14,12 +14,33 @@ #include "net.h" #include "devices.h" #include "boards.h" -#include "mainstone.h" #include "sysemu.h" #include "flash.h" #include "blockdev.h" #include "sysbus.h" +/* Device addresses */ +#define MST_FPGA_PHYS 0x08000000 +#define MST_ETH_PHYS 0x10000300 +#define MST_FLASH_0 0x00000000 +#define MST_FLASH_1 0x04000000 + +/* IRQ definitions */ +#define MMC_IRQ 0 +#define USIM_IRQ 1 +#define USBC_IRQ 2 +#define ETHERNET_IRQ 3 +#define AC97_IRQ 4 +#define PEN_IRQ 5 +#define MSINS_IRQ 6 +#define EXBRD_IRQ 7 +#define S0_CD_IRQ 9 +#define S0_STSCHG_IRQ 10 +#define S0_IRQ 11 +#define S1_CD_IRQ 13 +#define S1_STSCHG_IRQ 14 +#define S1_IRQ 15 + static struct keymap map[0xE0] = { [0 ... 0xDF] = { -1, -1 }, [0x1e] = {0,0}, /* a */ diff --git a/hw/mainstone.h b/hw/mainstone.h deleted file mode 100644 index e6a2b670e8..0000000000 --- a/hw/mainstone.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * PXA270-based Intel Mainstone platforms. - * - * Copyright (c) 2007 by Armin Kuster <akuster@kama-aina.net> or - * <akuster@mvista.com> - * - * This code is licensed under the GNU GPL v2. - */ - -#ifndef __MAINSTONE_H__ -#define __MAINSTONE_H__ - -/* Device addresses */ -#define MST_FPGA_PHYS 0x08000000 -#define MST_ETH_PHYS 0x10000300 -#define MST_FLASH_0 0x00000000 -#define MST_FLASH_1 0x04000000 - -/* IRQ definitions */ -#define MMC_IRQ 0 -#define USIM_IRQ 1 -#define USBC_IRQ 2 -#define ETHERNET_IRQ 3 -#define AC97_IRQ 4 -#define PEN_IRQ 5 -#define MSINS_IRQ 6 -#define EXBRD_IRQ 7 -#define S0_CD_IRQ 9 -#define S0_STSCHG_IRQ 10 -#define S0_IRQ 11 -#define S1_CD_IRQ 13 -#define S1_STSCHG_IRQ 14 -#define S1_IRQ 15 - -#endif /* __MAINSTONE_H__ */ |