diff options
author | Wolfgang Denk <wd@denx.de> | 2011-01-17 20:31:46 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-01-17 20:31:46 +0100 |
commit | e1ccf97c5d7651664d37c0c5aa243874b8851b2d (patch) | |
tree | 666d8970fcb8744ddefb039fc49a7d1a5a1d09e7 /include/configs/P1_P2_RDB.h | |
parent | aad813a342aca1a8127a283c64813e4ae4464d9c (diff) | |
parent | f133796da8ec87ccbafc9c492636def619d99401 (diff) | |
download | u-boot-imx-e1ccf97c5d7651664d37c0c5aa243874b8851b2d.zip u-boot-imx-e1ccf97c5d7651664d37c0c5aa243874b8851b2d.tar.gz u-boot-imx-e1ccf97c5d7651664d37c0c5aa243874b8851b2d.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include/configs/P1_P2_RDB.h')
-rw-r--r-- | include/configs/P1_P2_RDB.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index 2dfee3d..80b0b40 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -1,5 +1,5 @@ /* - * Copyright 2009-2010 Freescale Semiconductor, Inc. + * Copyright 2009-2011 Freescale Semiconductor, Inc. * * See file CREDITS for list of people who contributed to this * project. @@ -146,7 +146,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_FSL_DDR2 #undef CONFIG_FSL_DDR_INTERACTIVE #undef CONFIG_SPD_EEPROM /* Use SPD EEPROM for DDR setup */ -#undef CONFIG_DDR_DLL #define CONFIG_MEM_INIT_VALUE 0xDeadBeef @@ -359,6 +358,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); */ /* controller 2, Slot 2, tgtid 2, Base address 9000 */ +#define CONFIG_SYS_PCIE2_NAME "Slot 1" #define CONFIG_SYS_PCIE2_MEM_VIRT 0xa0000000 #define CONFIG_SYS_PCIE2_MEM_BUS 0xa0000000 #define CONFIG_SYS_PCIE2_MEM_PHYS 0xa0000000 @@ -369,6 +369,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_PCIE2_IO_SIZE 0x00010000 /* 64k */ /* controller 1, Slot 1, tgtid 1, Base address a000 */ +#define CONFIG_SYS_PCIE1_NAME "Slot 2" #define CONFIG_SYS_PCIE1_MEM_VIRT 0xc0000000 #define CONFIG_SYS_PCIE1_MEM_BUS 0xc0000000 #define CONFIG_SYS_PCIE1_MEM_PHYS 0xc0000000 @@ -541,6 +542,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); * the maximum mapped by the Linux kernel during initialization. */ #define CONFIG_SYS_BOOTMAPSZ (16 << 20)/* Initial Memory map for Linux*/ +#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* Increase max gunzip size */ #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ |