diff options
author | Wolfgang Denk | 2005-12-14 15:05:59 +0100 |
---|---|---|
committer | Wolfgang Denk | 2005-12-14 15:05:59 +0100 |
commit | e43232dee85d17dff4fad7fc8ff2bc5f6b9c7a76 (patch) | |
tree | 997dc610dece88a7dd6ec9303b16f99f40653e80 | |
parent | 7481266e4e4a1488ab197cc7beecd6eda0c34ffb (diff) | |
parent | 3a7b142b62a923838a0fa13b5b8bc0ce939b95cd (diff) |
Merge with /home/m8/git/u-boot
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | include/configs/o2dnt.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 6f5d8470221..ac3be077d14 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes for U-Boot 1.1.4: ====================================================================== +* Change port configuration for O2DNT (CODEC1 on PSC1). + * Fix register for PCI async mode on PPC440EP Patch by Youngchul Bang, 08 Dec 2005 diff --git a/include/configs/o2dnt.h b/include/configs/o2dnt.h index d7d27e51af1..5c05a745dbb 100644 --- a/include/configs/o2dnt.h +++ b/include/configs/o2dnt.h @@ -238,7 +238,7 @@ * GPIO configuration */ /*#define CFG_GPS_PORT_CONFIG 0x10002004 */ -#define CFG_GPS_PORT_CONFIG 0x00002004 /* no CAN */ +#define CFG_GPS_PORT_CONFIG 0x00002006 /* no CAN */ /* * Miscellaneous configurable options |