diff options
| author | Stefan Roese <sr@denx.de> | 2007-04-23 12:01:50 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-04-23 12:01:50 +0200 |
| commit | 8d1c439e2d9b0bdfe35df207e2c6b2f3a2312a3b (patch) | |
| tree | 223110de2b6eb0452d927a72c3a7b4d9090aa8ed /include | |
| parent | 323bfa8f436dc3bc57187c9b1488bc3146ff1522 (diff) | |
| parent | 14da5f7675bbb427c469e3f45006e027b6e21db9 (diff) | |
| download | u-boot-imx-8d1c439e2d9b0bdfe35df207e2c6b2f3a2312a3b.zip u-boot-imx-8d1c439e2d9b0bdfe35df207e2c6b2f3a2312a3b.tar.gz u-boot-imx-8d1c439e2d9b0bdfe35df207e2c6b2f3a2312a3b.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/IceCube.h | 2 | ||||
| -rw-r--r-- | include/configs/NC650.h | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index 0d38254..5988112 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -182,7 +182,7 @@ #define OF_CPU "PowerPC,5200@0" #define OF_SOC "soc5200@f0000000" -#define OF_TBCLK (bd->bi_busfreq / 8) +#define OF_TBCLK (bd->bi_busfreq / 4) #define OF_STDOUT_PATH "/soc5200@f0000000/serial@2000" /* diff --git a/include/configs/NC650.h b/include/configs/NC650.h index 8da29c4..a12c8da 100644 --- a/include/configs/NC650.h +++ b/include/configs/NC650.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2006 Detlev Zundel, dzu@denx.de + * (C) Copyright 2006, 2007 Detlev Zundel, dzu@denx.de * (C) Copyright 2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * @@ -237,18 +237,8 @@ /* * NAND flash support */ -#define CFG_NAND_LEGACY - #define CFG_MAX_NAND_DEVICE 1 -#define NAND_ChipID_UNKNOWN 0x00 -#define SECTORSIZE 512 -#define NAND_MAX_FLOORS 1 #define NAND_MAX_CHIPS 1 -#define ADDR_PAGE 2 -#define ADDR_COLUMN_PAGE 3 -#define ADDR_COLUMN 1 -#define NAND_NO_RB - /*----------------------------------------------------------------------- * SYPCR - System Protection Control 11-9 |