diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-05-12 19:26:45 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-05-12 19:26:45 +0200 |
| commit | 162eee41060896af666c70ae308d2bb13d971ccf (patch) | |
| tree | 80463960431e5e2c57bc329f53fe18ec9f6b1870 /include/configs | |
| parent | 8b6bbe104f908296722248eb1a430bc45d628fcf (diff) | |
| parent | 2e73808ee97d75400881d1fe144b062f427cfcb9 (diff) | |
| download | u-boot-imx-162eee41060896af666c70ae308d2bb13d971ccf.zip u-boot-imx-162eee41060896af666c70ae308d2bb13d971ccf.tar.gz u-boot-imx-162eee41060896af666c70ae308d2bb13d971ccf.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mv-common.h | 8 | ||||
| -rw-r--r-- | include/configs/mx31pdk.h | 3 | ||||
| -rw-r--r-- | include/configs/openrd.h (renamed from include/configs/openrd_base.h) | 33 |
3 files changed, 35 insertions, 9 deletions
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index a8937dd..0a39257 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -113,6 +113,9 @@ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +/* ====> Include platform Common Definitions */ +#include <asm/arch/config.h> + /* * DRAM Banks configuration, Custom config can be done in <board>.h */ @@ -124,10 +127,7 @@ #endif #endif /* CONFIG_NR_DRAM_BANKS */ -/* ====> Include platform Common Definations */ -#include <asm/arch/config.h> - -/* ====> Include driver Common Definations */ +/* ====> Include driver Common Definitions */ /* * Common NAND configuration */ diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index d4c6d16..f5d3ee7 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -61,6 +61,7 @@ #define CONFIG_MXC_UART 1 #define CONFIG_SYS_MX31_UART1 1 +#define CONFIG_HW_WATCHDOG #define CONFIG_HARD_SPI 1 #define CONFIG_MXC_SPI 1 @@ -98,6 +99,8 @@ */ #undef CONFIG_CMD_IMLS +#define BOARD_LATE_INIT + #define CONFIG_BOOTDELAY 3 #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/openrd_base.h b/include/configs/openrd.h index cfdd09c..3256cb3 100644 --- a/include/configs/openrd_base.h +++ b/include/configs/openrd.h @@ -27,13 +27,25 @@ * MA 02110-1301 USA */ -#ifndef _CONFIG_OPENRD_BASE_H -#define _CONFIG_OPENRD_BASE_H +#ifndef _CONFIG_OPENRD_H +#define _CONFIG_OPENRD_H /* * Version number information */ -#define CONFIG_IDENT_STRING "\nOpenRD_base" +#ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE +# define CONFIG_IDENT_STRING "\nOpenRD-Ultimate" +#else +# ifdef CONFIG_BOARD_IS_OPENRD_CLIENT +# define CONFIG_IDENT_STRING "\nOpenRD-Client" +# else +# ifdef CONFIG_BOARD_IS_OPENRD_BASE +# define CONFIG_IDENT_STRING "\nOpenRD-Base" +# else +# error Unknown OpenRD board specified +# endif +# endif +#endif /* * High Level Configuration Options (easy to change) @@ -48,6 +60,7 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ +#define CONFIG_SYS_MVFS #include <config_cmd_default.h> #define CONFIG_CMD_AUTOSCRIPT #define CONFIG_CMD_DHCP @@ -105,8 +118,18 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0x8 +# ifdef CONFIG_BOARD_IS_OPENRD_BASE +# define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +# else +# define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */ +# endif +# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE +# define CONFIG_PHY_BASE_ADR 0x0 +# define PHY_NO "88E1121" +# else +# define CONFIG_PHY_BASE_ADR 0x8 +# define PHY_NO "88E1116" +# endif #endif /* CONFIG_CMD_NET */ /* |