diff options
| author | Tom Rini <trini@ti.com> | 2013-12-02 08:44:28 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-02 08:44:28 -0500 |
| commit | 19210ae9838a867ce0243c41eafe928317c15b10 (patch) | |
| tree | ba804ff91483eb762f7138d163bef14385ae3b9e /arch | |
| parent | e40acc0a59319f9f3f0aba6ef10abd2dbf096ae1 (diff) | |
| parent | 67d4752d1dae768c7ff381272880d4aceeb62085 (diff) | |
| download | u-boot-imx-19210ae9838a867ce0243c41eafe928317c15b10.zip u-boot-imx-19210ae9838a867ce0243c41eafe928317c15b10.tar.gz u-boot-imx-19210ae9838a867ce0243c41eafe928317c15b10.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/include/asm/malta.h | 7 | ||||
| -rw-r--r-- | arch/mips/lib/bootm.c | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/arch/mips/include/asm/malta.h b/arch/mips/include/asm/malta.h index bd9043d..9e7c045 100644 --- a/arch/mips/include/asm/malta.h +++ b/arch/mips/include/asm/malta.h @@ -56,5 +56,12 @@ #define PCI_CFG_PIIX4_PIRQRCB 0x61 #define PCI_CFG_PIIX4_PIRQRCC 0x62 #define PCI_CFG_PIIX4_PIRQRCD 0x63 +#define PCI_CFG_PIIX4_SERIRQC 0x64 +#define PCI_CFG_PIIX4_GENCFG 0xb0 + +#define PCI_CFG_PIIX4_SERIRQC_EN (1 << 7) +#define PCI_CFG_PIIX4_SERIRQC_CONT (1 << 6) + +#define PCI_CFG_PIIX4_GENCFG_SERIRQ (1 << 16) #endif /* _MIPS_ASM_MALTA_H */ diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 1febf29..71bb0d2 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -196,8 +196,10 @@ static void boot_prep_linux(bootm_headers_t *images) if (cp) linux_env_set("eth1addr", cp); - if (mips_boot_malta) - linux_env_set("modetty0", "38400n8r"); + if (mips_boot_malta) { + sprintf(env_buf, "%un8r", gd->baudrate); + linux_env_set("modetty0", env_buf); + } } static void boot_jump_linux(bootm_headers_t *images) |