diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-09 20:50:26 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-09 20:50:26 +0100 |
| commit | fced09ae386d1aa7fcfdf9111c99da4be56e5b43 (patch) | |
| tree | a6915b1f18aa1ec47e757ea745384869e2b891ef /include/configs/iocon.h | |
| parent | 8d4addc3c3fe1a9ea160a5a1a20a1f934ff3fe97 (diff) | |
| parent | 2da0fc0d0fcdd991220cc120e5bc6d44991a5987 (diff) | |
| download | u-boot-imx-fced09ae386d1aa7fcfdf9111c99da4be56e5b43.zip u-boot-imx-fced09ae386d1aa7fcfdf9111c99da4be56e5b43.tar.gz u-boot-imx-fced09ae386d1aa7fcfdf9111c99da4be56e5b43.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'include/configs/iocon.h')
| -rw-r--r-- | include/configs/iocon.h | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/include/configs/iocon.h b/include/configs/iocon.h index 5e61b11..9fcc643 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -131,6 +131,12 @@ int fpga_gpio_get(int pin); #define I2C_DELAY udelay(25) /* 1/4 I2C clock duration */ /* + * OSD hardware + */ +#define CONFIG_SYS_MPC92469AC +#define CONFIG_SYS_CH7301 + +/* * FLASH organization */ #define CONFIG_SYS_FLASH_CFI /* The flash is CFI compatible */ @@ -231,13 +237,15 @@ int fpga_gpio_get(int pin); #define CONFIG_SYS_EBC_PB1AP 0x92015480 #define CONFIG_SYS_EBC_PB1CR 0xFB858000 -/* Memory Bank 2 (FPGA) initialization */ -#define CONFIG_SYS_FPGA_BASE 0x7f100000 +/* Memory Bank 2 (FPGA0) initialization */ +#define CONFIG_SYS_FPGA0_BASE 0x7f100000 #define CONFIG_SYS_EBC_PB2AP 0x02825080 -#define CONFIG_SYS_EBC_PB2CR (CONFIG_SYS_FPGA_BASE | 0x1a000) +#define CONFIG_SYS_EBC_PB2CR (CONFIG_SYS_FPGA0_BASE | 0x1a000) + +#define CONFIG_SYS_FPGA_BASE(k) CONFIG_SYS_FPGA0_BASE +#define CONFIG_SYS_FPGA_DONE(k) 0x0010 -#define CONFIG_SYS_FPGA_RFL_LOW 0x0000 -#define CONFIG_SYS_FPGA_RFL_HIGH 0x00fe +#define CONFIG_SYS_FPGA_COUNT 1 /* Memory Bank 3 (Latches) initialization */ #define CONFIG_SYS_LATCH_BASE 0x7f200000 @@ -249,4 +257,11 @@ int fpga_gpio_get(int pin); #define CONFIG_SYS_LATCH1_RESET 0xffff #define CONFIG_SYS_LATCH1_BOOT 0xffff +/* + * OSD Setup + */ +#define CONFIG_SYS_MPC92469AC +#define CONFIG_SYS_CH7301 +#define CONFIG_SYS_OSD_SCREENS CONFIG_SYS_FPGA_COUNT + #endif /* __CONFIG_H */ |