From 995118292cdc0f67299e049c2b11b429e8c295c8 Mon Sep 17 00:00:00 2001
From: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Date: Sat, 9 Jan 2016 17:32:44 +0100
Subject: [PATCH] MIPS: malta: do not pull in target header files in config.h

config.h is used in target and host code and therefore should not
pull in target header files to avoid compile errors. This change
is also required for the MIPS header file sync done in follow-up
patches.

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
---
 include/configs/malta.h | 9 +++------
 1 file 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
-- 
2.39.5