summaryrefslogtreecommitdiff
path: root/include/configs/MPC8536DS.h
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-23 00:52:30 +0200
committerWolfgang Denk <wd@denx.de>2009-07-23 00:52:30 +0200
commit05c37340183ff097b29d66e8d7862fc21162bc6e (patch)
tree0c2c940665a7333620c668855524536672eb46cf /include/configs/MPC8536DS.h
parent48677a1ef5f82adca49145a7baf11ece77f51945 (diff)
parent5a625149dbe14d381df454c459c6aaf27d59af20 (diff)
downloadu-boot-imx-05c37340183ff097b29d66e8d7862fc21162bc6e.zip
u-boot-imx-05c37340183ff097b29d66e8d7862fc21162bc6e.tar.gz
u-boot-imx-05c37340183ff097b29d66e8d7862fc21162bc6e.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include/configs/MPC8536DS.h')
-rw-r--r--include/configs/MPC8536DS.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 7085d28..0aaab4a 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -45,6 +45,7 @@
#define CONFIG_SYS_PCI_64BIT 1 /* enable 64-bit PCI resources */
#define CONFIG_FSL_LAW 1 /* Use common FSL init code */
+#define CONFIG_E1000 1 /* Defind e1000 pci Ethernet card*/
#define CONFIG_TSEC_ENET /* tsec ethernet support */
#define CONFIG_ENV_OVERWRITE
@@ -218,6 +219,13 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
#define PIXIS_VCFGEN1 0x13 /* VELA Config Enable 1 */
#define PIXIS_VCORE0 0x14 /* VELA VCORE0 Register */
#define PIXIS_VBOOT 0x16 /* VELA VBOOT Register */
+#define PIXIS_VBOOT_LBMAP 0xe0 /* VBOOT - CFG_LBMAP */
+#define PIXIS_VBOOT_LBMAP_NOR0 0x00 /* cfg_lbmap - boot from NOR 0 */
+#define PIXIS_VBOOT_LBMAP_NOR1 0x01 /* cfg_lbmap - boot from NOR 1 */
+#define PIXIS_VBOOT_LBMAP_NOR2 0x02 /* cfg_lbmap - boot from NOR 2 */
+#define PIXIS_VBOOT_LBMAP_NOR3 0x03 /* cfg_lbmap - boot from NOR 3 */
+#define PIXIS_VBOOT_LBMAP_PJET 0x04 /* cfg_lbmap - boot from projet */
+#define PIXIS_VBOOT_LBMAP_NAND 0x05 /* cfg_lbmap - boot from NAND */
#define PIXIS_VSPEED0 0x17 /* VELA VSpeed 0 */
#define PIXIS_VSPEED1 0x18 /* VELA VSpeed 1 */
#define PIXIS_VSPEED2 0x19 /* VELA VSpeed 2 */
@@ -563,10 +571,10 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
/*
* For booting Linux, the board info and command line data
- * have to be in the first 8 MB of memory, since this is
+ * have to be in the first 16 MB of memory, since this is
* the maximum mapped by the Linux kernel during initialization.
*/
-#define CONFIG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux*/
+#define CONFIG_SYS_BOOTMAPSZ (16 << 20) /* Initial Memory map for Linux*/
/*
* Internal Definitions