diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-04 20:05:18 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-04 20:05:18 +0200 |
| commit | 0a9403c8c753837a27b14ac33bc2b80d362c0e80 (patch) | |
| tree | 175f478e1ed24923334a79a0bfa15d9180805fdd /drivers | |
| parent | 42f9ebff2f758bef524780a00c712eb63a72d99b (diff) | |
| parent | e6a6789f41f0560ce280089fbd3f1bd0f0f64306 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/fsl_law.c | 3 | ||||
| -rw-r--r-- | drivers/pci/fsl_pci_init.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c index be43a3ecf6..f7d454dce4 100644 --- a/drivers/misc/fsl_law.c +++ b/drivers/misc/fsl_law.c @@ -139,6 +139,9 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (set_last_law(start, law_sz_enc, id) < 0) return -1; + /* recalculate size based on what was actually covered by the law */ + law_sz = 1ull << __ilog2_u64(law_sz); + /* do we still have anything to map */ sz = sz - law_sz; if (sz) { diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index 20b2dcc767..19cf1ce1a0 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR; */ #include <pci.h> -#include <asm/immap_fsl_pci.h> +#include <asm/fsl_pci.h> /* Freescale-specific PCI config registers */ #define FSL_PCI_PBFR 0x44 |