summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-01-25 21:13:04 +0100
committerWolfgang Denk <wd@denx.de>2011-01-25 21:13:04 +0100
commit5aebe3b07254d9ec8f7ae23a4525a6c535a7f858 (patch)
tree398660b7a43c39cee91c51e54678eab46aa7103d /drivers
parentd6a5e6d531e357dd8016141f73d370d02886a7eb (diff)
parent92966835e96af324fed574815036e481be807d04 (diff)
downloadu-boot-imx-5aebe3b07254d9ec8f7ae23a4525a6c535a7f858.zip
u-boot-imx-5aebe3b07254d9ec8f7ae23a4525a6c535a7f858.tar.gz
u-boot-imx-5aebe3b07254d9ec8f7ae23a4525a6c535a7f858.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers')
-rw-r--r--drivers/misc/fsl_law.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c
index 6589076..63c08bf 100644
--- a/drivers/misc/fsl_law.c
+++ b/drivers/misc/fsl_law.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2010 Freescale Semiconductor, Inc.
+ * Copyright 2008-2011 Freescale Semiconductor, Inc.
*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@ -29,26 +29,7 @@
DECLARE_GLOBAL_DATA_PTR;
-/* number of LAWs in the hw implementation */
-#if defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || \
- defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555)
-#define FSL_HW_NUM_LAWS 8
-#elif defined(CONFIG_MPC8548) || defined(CONFIG_MPC8544) || \
- defined(CONFIG_MPC8568) || defined(CONFIG_MPC8569) || \
- defined(CONFIG_MPC8641) || defined(CONFIG_MPC8610)
-#define FSL_HW_NUM_LAWS 10
-#elif defined(CONFIG_MPC8536) || defined(CONFIG_MPC8572) || \
- defined(CONFIG_P1011) || defined(CONFIG_P1020) || \
- defined(CONFIG_P1012) || defined(CONFIG_P1021) || \
- defined(CONFIG_P1013) || defined(CONFIG_P1022) || \
- defined(CONFIG_P2010) || defined(CONFIG_P2020)
-#define FSL_HW_NUM_LAWS 12
-#elif defined(CONFIG_PPC_P3041) || defined(CONFIG_PPC_P4080) || \
- defined(CONFIG_PPC_P5020)
-#define FSL_HW_NUM_LAWS 32
-#else
-#error FSL_HW_NUM_LAWS not defined for this platform
-#endif
+#define FSL_HW_NUM_LAWS CONFIG_SYS_FSL_NUM_LAWS
#ifdef CONFIG_FSL_CORENET
#define LAW_BASE (CONFIG_SYS_FSL_CORENET_CCM_ADDR)