summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorEvert Pap <evert.pap@sintecs.nl>2016-03-31 15:35:05 (GMT)
committerEvert Pap <evert.pap@sintecs.nl>2016-05-04 10:57:17 (GMT)
commit96602f16d3abad2d2871ec2d09194789c540fa47 (patch)
treefb43f02dff7a6b543de308c8770fd13e8a57064b /arch
parent5c19689b5e1f02f85528e7258623cc17c191097b (diff)
downloadu-boot-fsl-qoriq-96602f16d3abad2d2871ec2d09194789c540fa47.tar.xz
Add support for the Scalys SimC-t10xx SOM
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/cpu/mpc85xx/Kconfig5
-rw-r--r--arch/powerpc/include/asm/immap_85xx.h2
-rw-r--r--arch/powerpc/include/asm/mpc8xxx_gpio.h4
3 files changed, 9 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index 0b89157..d6d372f 100644
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -152,6 +152,10 @@ config TARGET_UCP1020
config TARGET_CYRUS
bool "Support Varisys Cyrus"
+config TARGET_SIMC_T10XX
+ bool "Support simc-t10xx"
+ select SUPPORT_SPL
+
endchoice
source "board/freescale/b4860qds/Kconfig"
@@ -187,6 +191,7 @@ source "board/freescale/t4rdb/Kconfig"
source "board/gdsys/p1022/Kconfig"
source "board/keymile/kmp204x/Kconfig"
source "board/sbc8548/Kconfig"
+source "board/scalys/simc-t10xx/Kconfig"
source "board/socrates/Kconfig"
source "board/varisys/cyrus/Kconfig"
source "board/xes/xpedite520x/Kconfig"
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 746ad2a..e0df5ad 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -3200,7 +3200,7 @@ struct ccsr_scfg {
#if defined(CONFIG_PPC_T1013) || defined(CONFIG_PPC_T1014) ||\
defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022) ||\
defined(CONFIG_PPC_T1023) || defined(CONFIG_PPC_T1024) ||\
- defined(CONFIG_PPC_T1040) || defined(CONFIG_PPC_T1042) ||\
+ defined(CONFIG_PPC_T1040) || defined(CONFIG_PPC_T1042)
#define CONFIG_SYS_MPC8XXX_GPIO1_ADDR (CONFIG_SYS_IMMR + 0x130000)
#define CONFIG_SYS_MPC8XXX_GPIO2_ADDR (CONFIG_SYS_IMMR + 0x131000)
#define CONFIG_SYS_MPC8XXX_GPIO3_ADDR (CONFIG_SYS_IMMR + 0x132000)
diff --git a/arch/powerpc/include/asm/mpc8xxx_gpio.h b/arch/powerpc/include/asm/mpc8xxx_gpio.h
index d4a5b7c..1069638 100644
--- a/arch/powerpc/include/asm/mpc8xxx_gpio.h
+++ b/arch/powerpc/include/asm/mpc8xxx_gpio.h
@@ -6,6 +6,8 @@
#ifndef _POWERPC_ASM_MPC8XXX_GPIO_H
#define _POWERPC_ASM_MPC8XXX_GPIO_H
+#include <asm-generic/errno.h>
+
#define MPC8XXX_GPIO_NR(port, pin) ((((port)-1)*32)+((pin)&31))
#define MPC8XXX_GPIO_TO_PORT(gpio) (gpio/32)
#define MPC8XXX_GPIO_TO_PIN(gpio) (gpio&31)
@@ -86,7 +88,7 @@ static inline int mpc8xxx_gpio_get(uint32_t gpio, int value)
break;
#endif
default:
- return;
+ return -ENODEV;
}
/* Get inputs */