summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-01-16 21:45:31 -0500
committerTom Rini <trini@konsulko.com>2016-01-16 21:45:31 -0500
commitb57843e68804c2d53d2cff2b8b2238e37b388faa (patch)
tree1edb3e718d02661b29071fd8b7375082655d3c9e /include
parentb8c5b47296414c7cef84a879c0c90202bc22720c (diff)
parent0e0efb40b874633360967f532eb1ed59ad02adbe (diff)
downloadu-boot-b57843e68804c2d53d2cff2b8b2238e37b388faa.tar.gz
u-boot-b57843e68804c2d53d2cff2b8b2238e37b388faa.tar.xz
u-boot-b57843e68804c2d53d2cff2b8b2238e37b388faa.zip
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'include')
-rw-r--r--include/configs/malta.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/include/configs/malta.h b/include/configs/malta.h
index 3faac37632..aecc8cef90 100644
--- a/include/configs/malta.h
+++ b/include/configs/malta.h
@@ -7,9 +7,6 @@
#ifndef _MALTA_CONFIG_H
#define _MALTA_CONFIG_H
-#include <asm/addrspace.h>
-#include <asm/malta.h>
-
/*
* System configuration
*/
@@ -83,14 +80,14 @@
#define CONFIG_SYS_NS16550_SERIAL
#define CONFIG_SYS_NS16550_REG_SIZE 1
#define CONFIG_SYS_NS16550_CLK (115200 * 16)
-#define CONFIG_SYS_NS16550_COM1 CKSEG1ADDR(MALTA_GT_UART0_BASE)
-#define CONFIG_SYS_NS16550_COM2 CKSEG1ADDR(MALTA_MSC01_UART0_BASE)
+#define CONFIG_SYS_NS16550_COM1 0xb80003f8
+#define CONFIG_SYS_NS16550_COM2 0xbb0003f8
#define CONFIG_CONS_INDEX 1
/*
* Flash configuration
*/
-#define CONFIG_SYS_FLASH_BASE (KSEG1 | MALTA_FLASH_BASE)
+#define CONFIG_SYS_FLASH_BASE 0xbe000000
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_MAX_FLASH_SECT 128
#define CONFIG_SYS_FLASH_CFI