diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-25 00:55:26 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-25 00:55:26 +0200 |
| commit | e22ba10107fb2ad4c24634af484363e5dcd65312 (patch) | |
| tree | 8197692c139403511bbdc85e348fba3e2ff0babc /include/configs | |
| parent | c1fa1b7d00712b41a6c710e7ed33782cb3f47191 (diff) | |
| parent | 6cfa9eecb4409b1b4e8b4753b2ddfbe33e28bd93 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/dlvision-10g.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index f7609d71a9..4fc5262bc1 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -42,6 +42,10 @@ #define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */ +#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ +#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ +#define CONFIG_AUTOBOOT_STOP_STR " " + /* * Configure PLL */ @@ -111,9 +115,10 @@ /* Temp sensor/hwmon/dtt */ #define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0 } /* Sensor addresses */ +#define CONFIG_DTT_SENSORS { 0x4c, 0x4e } /* Sensor addresses */ #define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 40, 10 }, { 50, 20 }, { 60, 40 } } + { { 40, 10 }, { 43, 13 }, { 46, 16 }, \ + { 50, 20 }, { 53, 27 }, { 56, 34 }, { 60, 40 } } #define CONFIG_DTT_TACH_LIMIT 0xa10 /* EBC peripherals */ @@ -136,6 +141,8 @@ #define CONFIG_SYS_LATCH1_RESET 0xffcf #define CONFIG_SYS_LATCH1_BOOT 0xffff +#define CONFIG_SYS_FPGA_NO_RFL_HI + /* * FLASH organization */ @@ -310,6 +317,7 @@ * OSD Setup */ #define CONFIG_SYS_ICS8N3QV01 +#define CONFIG_SYS_MPC92469AC #define CONFIG_SYS_SIL1178 #define CONFIG_SYS_OSD_SCREENS CONFIG_SYS_FPGA_COUNT |