diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-01 23:58:11 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-01 23:58:11 +0100 |
| commit | d51e6d6de2b7dcba43fadcae2c89f7346d8bc301 (patch) | |
| tree | 49bedf2073e031a421c89644f62134bf9ee4f44b /include/configs/P1022DS.h | |
| parent | 22e0f5a9ecab85f36a0fe69892d950c1ac212c91 (diff) | |
| parent | 9839709ea3df89f6021034508f48b97cab33ebb8 (diff) | |
| download | u-boot-imx-d51e6d6de2b7dcba43fadcae2c89f7346d8bc301.zip u-boot-imx-d51e6d6de2b7dcba43fadcae2c89f7346d8bc301.tar.gz u-boot-imx-d51e6d6de2b7dcba43fadcae2c89f7346d8bc301.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
* 'master' of git://git.denx.de/u-boot-mpc85xx:
mpc85xx: support for Freescale COM Express P2020
arch/powerpc/cpu/mpc8xxx/ddr/interactive.c: Fix GCC 4.6 build warning
mpc85xx: support board-specific reset function
powerpc/85xx: verify the localbus device tree address before booting the OS
mpc8xxx: update module_type values from JEDEC DDR3 SPD Specification
powerpc/p3060qds: Add board related support for P3060QDS platform
powerpc/85xx: clean up and document the QE/FMAN microcode macros
powerpc/85xx: always implement the work-around for Erratum SATA_A001
powerpc/85xx: CONFIG_FSL_SATA_V2 should be defined in config_mpc85xx.h
powerpc/85xx: Add workaround for erratum A-003474
powerpc/85xx: fixup flexcan device tree clock-frequency
powerpc/85xx: Add workaround for erratum CPU-A003999
Diffstat (limited to 'include/configs/P1022DS.h')
| -rw-r--r-- | include/configs/P1022DS.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 1158fec..70d751d 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -345,7 +345,6 @@ /* SATA */ #define CONFIG_LIBATA #define CONFIG_FSL_SATA -#define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_SATA_MAX_DEVICE 2 #define CONFIG_SATA1 |