summaryrefslogtreecommitdiff
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-03-31 09:01:36 +0200
committerWolfgang Denk <wd@denx.de>2011-03-31 09:01:36 +0200
commitb12fee010cff9738735e0f213205906ff68aead8 (patch)
tree2866f540a80650bf2e036d159bd7a2972666ec20 /arch/powerpc/include
parent53ce77eef1090e3f4004398c1d2abb410b63235c (diff)
parentb03a466d6ceb9dbfd1a1638f355e9c8b4833259f (diff)
downloadu-boot-imx-b12fee010cff9738735e0f213205906ff68aead8.zip
u-boot-imx-b12fee010cff9738735e0f213205906ff68aead8.tar.gz
u-boot-imx-b12fee010cff9738735e0f213205906ff68aead8.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/config_mpc85xx.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 3a29d1c..6c16681 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -90,12 +90,14 @@
#define CONFIG_MAX_CPUS 1
#define CONFIG_SYS_FSL_NUM_LAWS 12
#define CONFIG_TSECV2
+#define CONFIG_FSL_PCIE_DISABLE_ASPM
#define CONFIG_SYS_FSL_SEC_COMPAT 2
#elif defined(CONFIG_P1012)
#define CONFIG_MAX_CPUS 1
#define CONFIG_SYS_FSL_NUM_LAWS 12
#define CONFIG_TSECV2
+#define CONFIG_FSL_PCIE_DISABLE_ASPM
#define CONFIG_SYS_FSL_SEC_COMPAT 2
#elif defined(CONFIG_P1013)
@@ -103,6 +105,9 @@
#define CONFIG_SYS_FSL_NUM_LAWS 12
#define CONFIG_TSECV2
#define CONFIG_SYS_FSL_SEC_COMPAT 2
+#define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
+#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
+#define CONFIG_FSL_SATA_ERRATUM_A001
#elif defined(CONFIG_P1014)
#define CONFIG_MAX_CPUS 1
@@ -114,12 +119,14 @@
#define CONFIG_MAX_CPUS 2
#define CONFIG_SYS_FSL_NUM_LAWS 12
#define CONFIG_TSECV2
+#define CONFIG_FSL_PCIE_DISABLE_ASPM
#define CONFIG_SYS_FSL_SEC_COMPAT 2
#elif defined(CONFIG_P1021)
#define CONFIG_MAX_CPUS 2
#define CONFIG_SYS_FSL_NUM_LAWS 12
#define CONFIG_TSECV2
+#define CONFIG_FSL_PCIE_DISABLE_ASPM
#define CONFIG_SYS_FSL_SEC_COMPAT 2
#elif defined(CONFIG_P1022)
@@ -127,6 +134,9 @@
#define CONFIG_SYS_FSL_NUM_LAWS 12
#define CONFIG_TSECV2
#define CONFIG_SYS_FSL_SEC_COMPAT 2
+#define CONFIG_SYS_FSL_ERRATUM_ELBC_A001
+#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
+#define CONFIG_FSL_SATA_ERRATUM_A001
#elif defined(CONFIG_P2010)
#define CONFIG_MAX_CPUS 1