summaryrefslogtreecommitdiff
path: root/common/include
diff options
context:
space:
mode:
authorCyril Jourdan2012-09-27 11:07:24 +0200
committerCyril Jourdan2012-10-01 13:57:27 +0200
commitbeff091b4754e6b24da3d5736972f1f70e93ce39 (patch)
treee5e7bbc2e2d8fb4ad1cd9dc29e716c805b6fbde1 /common/include
parent64def381dcc7ce19a932792754e48660f4d9fc3d (diff)
{common, polux}: create mse500_200 chip and board, refs #3373
Diffstat (limited to 'common/include')
-rw-r--r--common/include/asm/arch/gpio.h2
-rw-r--r--common/include/asm/arch/ips/hardware/sys_apb.h2
-rw-r--r--common/include/asm/arch/platform.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/common/include/asm/arch/gpio.h b/common/include/asm/arch/gpio.h
index f7a45d1ac1..465dd41f0b 100644
--- a/common/include/asm/arch/gpio.h
+++ b/common/include/asm/arch/gpio.h
@@ -22,7 +22,7 @@
#include <asm/arch/ips/gpio.h>
-#ifndef CONFIG_CHIP_MSE500DINI_200
+#if !defined (CONFIG_CHIP_MSE500DINI_200) && !defined (CONFIG_CHIP_MSE500_200)
#include <asm/arch/nvram.h>
/* SPC300 GPIOs will use GENERIC_GPIO and GPIO_LIB */
diff --git a/common/include/asm/arch/ips/hardware/sys_apb.h b/common/include/asm/arch/ips/hardware/sys_apb.h
index 314d7bc958..9b839fe65c 100644
--- a/common/include/asm/arch/ips/hardware/sys_apb.h
+++ b/common/include/asm/arch/ips/hardware/sys_apb.h
@@ -37,7 +37,7 @@
#define MAILBOXES_BASE (SYS_APB_BASE+0x030000)
#define MARIA_REGBANK_BASE (SYS_APB_BASE+0x040000)
-#ifdef CONFIG_CHIP_MSE500
+#if defined (CONFIG_CHIP_MSE500) || defined (CONFIG_CHIP_MSE500_200)
#include "pkg_maria2_regbank.h"
#else
#include "pkg_maria_regbank.h"
diff --git a/common/include/asm/arch/platform.h b/common/include/asm/arch/platform.h
index d577514d4f..1be2bd0e97 100644
--- a/common/include/asm/arch/platform.h
+++ b/common/include/asm/arch/platform.h
@@ -104,7 +104,7 @@ extern uint32_t spc300_plc_mem_size;
#define PLC_SYSCLOCK_MHZ (150)
#define PLC_UARTCLOCK_MHZ (47)
-#elif defined (CONFIG_CHIP_MSE500DINI_200)
+#elif defined (CONFIG_CHIP_MSE500DINI_200) || defined (CONFIG_CHIP_MSE500_200)
/* polux/linux/asm/arch/platform.h uses polux/include/platform.h...
* It is dirty, but make this clean would imply many changes and impact SPC200
* specific code. So we keep it this way for MSE500. */