diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-12 20:37:47 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-12 20:37:47 +0100 |
| commit | c65715de780945950d570e2b69f94e0b186f04b4 (patch) | |
| tree | 7b0e2e835d581849ce3c71e73223b0e44c254f8b /include | |
| parent | 8b1a714013eb120674f1cfed82a838ac9cf6658f (diff) | |
| parent | 9d3f9118a9b4b54bbea48bac51c0dec7180edec0 (diff) | |
| download | u-boot-imx-c65715de780945950d570e2b69f94e0b186f04b4.zip u-boot-imx-c65715de780945950d570e2b69f94e0b186f04b4.tar.gz u-boot-imx-c65715de780945950d570e2b69f94e0b186f04b4.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/incaip.h | 9 | ||||
| -rw-r--r-- | include/configs/vct.h | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/include/configs/incaip.h b/include/configs/incaip.h index b7ba6f4..f2950e8 100644 --- a/include/configs/incaip.h +++ b/include/configs/incaip.h @@ -31,9 +31,12 @@ #define CONFIG_MIPS32 1 /* MIPS 4Kc CPU core */ #define CONFIG_INCA_IP 1 /* on a INCA-IP Board */ -#ifndef CPU_CLOCK_RATE -/* allowed values: 100000000, 133000000, and 150000000 */ -#define CPU_CLOCK_RATE 150000000 /* default: 150 MHz clock for the MIPS core */ +/* + * Clock for the MIPS core (MHz) + * allowed values: 100000000, 133000000, and 150000000 (default) + */ +#ifndef CONFIG_CPU_CLOCK_RATE +#define CONFIG_CPU_CLOCK_RATE 150000000 #endif #define INFINEON_EBU_BOOTCFG 0x40C4 /* CMULT = 8 */ diff --git a/include/configs/vct.h b/include/configs/vct.h index 4894969..325ac8c 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -109,17 +109,20 @@ /* * Only Premium/Platinum have ethernet support right now */ -#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM) +#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \ + !defined(CONFIG_VCT_SMALL_IMAGE) #define CONFIG_CMD_PING #define CONFIG_CMD_SNTP #else #undef CONFIG_CMD_NET +#undef CONFIG_CMD_NFS #endif /* * Only Premium/Platinum have USB-EHCI support right now */ -#if defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM) +#if (defined(CONFIG_VCT_PREMIUM) || defined(CONFIG_VCT_PLATINUM)) && \ + !defined(CONFIG_VCT_SMALL_IMAGE) #define CONFIG_CMD_USB #define CONFIG_CMD_FAT #endif |