diff options
| author | Sandeep Paulraj <s-paulraj@ti.com> | 2010-12-11 10:35:40 -0500 |
|---|---|---|
| committer | Sandeep Paulraj <s-paulraj@ti.com> | 2010-12-11 10:35:40 -0500 |
| commit | 917a62c0d292d9da45100a76151a9fa2d13a9cdc (patch) | |
| tree | 3ad9269efbd993f516edb708e0d51e937e017847 /include | |
| parent | fb69abf269c789f9e53f70abedc98872a3f49562 (diff) | |
| parent | 2ced53e1ad552a7a192b2f3c9671e60eb668ecfa (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot into next
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/AP1000.h | 1 | ||||
| -rw-r--r-- | include/configs/DASA_SIM.h | 1 | ||||
| -rw-r--r-- | include/configs/ML2.h | 1 | ||||
| -rw-r--r-- | include/configs/MOUSSE.h | 1 | ||||
| -rw-r--r-- | include/configs/MVSMR.h | 1 | ||||
| -rw-r--r-- | include/configs/inka4x0.h | 1 | ||||
| -rw-r--r-- | include/configs/rsdproto.h | 1 | ||||
| -rw-r--r-- | include/configs/uc101.h | 1 |
8 files changed, 8 insertions, 0 deletions
diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h index ffaab79618..37dd757732 100644 --- a/include/configs/AP1000.h +++ b/include/configs/AP1000.h @@ -33,6 +33,7 @@ * run from RAM instead of Flash. */ #define CONFIG_SYS_TEXT_BASE 0x08000000 +#define CONFIG_SYS_LDSCRIPT "board/amirix/ap1000/u-boot.lds" #define CONFIG_PCI 1 diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h index 3706071c99..53229d94b5 100644 --- a/include/configs/DASA_SIM.h +++ b/include/configs/DASA_SIM.h @@ -37,6 +37,7 @@ #define CONFIG_DASA_SIM 1 /* ...on a DASA_SIM board */ #define CONFIG_SYS_TEXT_BASE 0xFFFC0000 +#define CONFIG_SYS_LDSCRIPT "board/esd/dasa_sim/u-boot.lds" #define CONFIG_BOARD_EARLY_INIT_F 1 /* call board_early_init_f() */ diff --git a/include/configs/ML2.h b/include/configs/ML2.h index 1e96b9e10e..4df9f4cbc5 100644 --- a/include/configs/ML2.h +++ b/include/configs/ML2.h @@ -31,6 +31,7 @@ #define CONFIG_ML2 1 /* ...on a ML2 board */ #define CONFIG_SYS_TEXT_BASE 0x18000000 +#define CONFIG_SYS_LDSCRIPT "board/ml2/u-boot.lds" #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h index 9529c87503..c809a6b363 100644 --- a/include/configs/MOUSSE.h +++ b/include/configs/MOUSSE.h @@ -50,6 +50,7 @@ #define CONFIG_MOUSSE 1 #define CONFIG_SYS_TEXT_BASE 0xFFF00000 +#define CONFIG_SYS_LDSCRIPT "board/mousse/u-boot.lds" #define CONFIG_SYS_ADDR_MAP_B 1 diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h index f7fd9b2eb0..f94ad5caf2 100644 --- a/include/configs/MVSMR.h +++ b/include/configs/MVSMR.h @@ -35,6 +35,7 @@ #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0xFF800000 #endif +#define CONFIG_SYS_LDSCRIPT "board/matrix_vision/mvsmr/u-boot.lds" #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 9b116e690e..b19d54481f 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -44,6 +44,7 @@ #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0xFFE00000 /* Standard: boot low */ #endif +#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds" #define CONFIG_SYS_MPC5XXX_CLKIN 33000000 /* ... running at 33.000000MHz */ diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h index 5761f20a19..2ed189ef67 100644 --- a/include/configs/rsdproto.h +++ b/include/configs/rsdproto.h @@ -40,6 +40,7 @@ #define CONFIG_CPM2 1 /* Has a CPM2 */ #define CONFIG_SYS_TEXT_BASE 0xff000000 +#define CONFIG_SYS_LDSCRIPT "board/rsdproto/u-boot.lds" #define CONFIG_MISC_INIT_F 1 /* Use misc_init_f() */ diff --git a/include/configs/uc101.h b/include/configs/uc101.h index 483534c41c..f13669181c 100644 --- a/include/configs/uc101.h +++ b/include/configs/uc101.h @@ -35,6 +35,7 @@ #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0xFFF00000 #endif +#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds" #include "manroland/common.h" #include "manroland/mpc5200-common.h" |