diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-01 22:24:33 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-01 22:24:33 (GMT) |
| commit | dfc91c33957c95da34e3888dc87912d5c15a7603 (patch) | |
| tree | d5fd6bd3818d817ea618bb9c19330633a71ab1bb /include/configs/cm41xx.h | |
| parent | c123098035be8bae3859bbfbd06861f197c07631 (diff) | |
| parent | 0fc4f64c59873a47d555dd66bad25797d4ecb0ed (diff) | |
| download | u-boot-dfc91c33957c95da34e3888dc87912d5c15a7603.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/cm41xx.h')
| -rw-r--r-- | include/configs/cm41xx.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h index 02cb1ef..ea374da 100644 --- a/include/configs/cm41xx.h +++ b/include/configs/cm41xx.h @@ -53,6 +53,7 @@ * select serial console configuration */ #define CONFIG_ENV_IS_NOWHERE +#define CONFIG_KS8695_SERIAL #define CONFIG_SERIAL1 #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 @@ -93,8 +94,6 @@ #define CONFIG_SYS_MEMTEST_START 0x00800000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0x01000000 /* 16 MB in DRAM */ -#undef CONFIG_SYS_CLKS_IN_HZ /* everything, incl board info, in Hz */ - #define CONFIG_SYS_LOAD_ADDR 0x00008000 /* default load address */ #define CONFIG_SYS_HZ (1000) /* 1ms resolution ticks */ |