diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2007-01-24 10:26:47 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-01-24 10:26:47 +0100 |
| commit | b78bb469f536b357ee21c54f40201dbe4b201ac3 (patch) | |
| tree | 0b50c86350509dc5be1d7cfef108d97eb3dc69fe /include | |
| parent | a4012396645533aef218354eeba754dff0deace8 (diff) | |
| parent | 2daf046ba627f85f44195815778140039636244e (diff) | |
Merge with /home/tur/proj/idmr/u-boot
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m68k/m5271.h | 6 | ||||
| -rw-r--r-- | include/configs/idmr.h | 20 |
2 files changed, 24 insertions, 2 deletions
diff --git a/include/asm-m68k/m5271.h b/include/asm-m68k/m5271.h index 765414fdc..e0f02cf7f 100644 --- a/include/asm-m68k/m5271.h +++ b/include/asm-m68k/m5271.h @@ -57,6 +57,12 @@ #define MCF_GPIO_PAR_FECI2C 0x100047 #define MCF_GPIO_PAR_UART 0x100048 +#define MCF_CCM_CIR 0x11000A +#define MCF_CCM_CIR_PRN_MASK 0x3F +#define MCF_CCM_CIR_PIN_LEN 6 +#define MCF_CCM_CIR_PIN_MCF5270 0x2e +#define MCF_CCM_CIR_PIN_MCF5271 0x80 + #define MCF_GPIO_AD_ADDR23 0x80 #define MCF_GPIO_AD_ADDR22 0x40 #define MCF_GPIO_AD_ADDR21 0x20 diff --git a/include/configs/idmr.h b/include/configs/idmr.h index 48915b32e..b1dbe2ccb 100644 --- a/include/configs/idmr.h +++ b/include/configs/idmr.h @@ -83,8 +83,8 @@ */ #define CONFIG_COMMANDS ((CONFIG_CMD_DFL | \ CFG_CMD_PING | \ - CFG_CMD_NET | \ - CFG_CMD_MII) & \ + CFG_CMD_JFFS2 | \ + CFG_CMD_NET) & \ ~(CFG_CMD_LOADS | \ CFG_CMD_LOADB)) @@ -194,4 +194,20 @@ /* Port configuration */ #define CFG_FECI2C 0xF0 + + +/* Dynamic MTD partition support */ +#define CONFIG_JFFS2_CMDLINE +#define MTDIDS_DEFAULT "nor0=idmr-0" + +#define MTDPARTS_DEFAULT "mtdparts=idmr-0:128k(u-boot)," \ + "64k(env)," \ + "640k(kernel)," \ + "2m(rootfs)," \ + "-(user)"; + +#if (CONFIG_COMMANDS & CFG_CMD_MII) +#error MII commands don't work on iDMR board and sholud not be enabled. +#endif /* (CONFIG_COMMANDS & CFG_CMD_MII) */ + #endif /* _IDMR_H */ |