diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-02 00:24:33 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-02 00:24:33 +0200 |
| commit | dfc91c33957c95da34e3888dc87912d5c15a7603 (patch) | |
| tree | d5fd6bd3818d817ea618bb9c19330633a71ab1bb /include/configs/armadillo.h | |
| parent | c123098035be8bae3859bbfbd06861f197c07631 (diff) | |
| parent | 0fc4f64c59873a47d555dd66bad25797d4ecb0ed (diff) | |
| download | u-boot-imx-dfc91c33957c95da34e3888dc87912d5c15a7603.zip u-boot-imx-dfc91c33957c95da34e3888dc87912d5c15a7603.tar.gz u-boot-imx-dfc91c33957c95da34e3888dc87912d5c15a7603.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/armadillo.h')
| -rw-r--r-- | include/configs/armadillo.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h index 5a4ceaf..7ba5e17 100644 --- a/include/configs/armadillo.h +++ b/include/configs/armadillo.h @@ -64,6 +64,7 @@ /* * select serial console configuration */ +#define CONFIG_CLPS7111_SERIAL #define CONFIG_SERIAL1 1 /* we use Serial line 1 */ /* allow to overwrite serial and ethaddr */ @@ -105,8 +106,6 @@ #define CONFIG_SYS_MEMTEST_START 0xc0400000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_END 0xc0800000 /* 4 ... 8 MB in DRAM */ -#undef CONFIG_SYS_CLKS_IN_HZ /* everything, incl board info, in Hz */ - #define CONFIG_SYS_LOAD_ADDR 0x00040000 /* default load address for armadillo: kernel img is here*/ #define CONFIG_SYS_HZ 2000 /* decrementer freq: 2 kHz */ |