diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /board/gaisler | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.bz2 | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'board/gaisler')
| -rw-r--r-- | board/gaisler/gr_cpci_ax2000/u-boot.lds | 2 | ||||
| -rw-r--r-- | board/gaisler/gr_ep2s60/u-boot.lds | 2 | ||||
| -rw-r--r-- | board/gaisler/gr_xc3s_1500/u-boot.lds | 2 | ||||
| -rw-r--r-- | board/gaisler/grsim/u-boot.lds | 2 | ||||
| -rw-r--r-- | board/gaisler/grsim_leon2/u-boot.lds | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/board/gaisler/gr_cpci_ax2000/u-boot.lds b/board/gaisler/gr_cpci_ax2000/u-boot.lds index 3958670..a087631 100644 --- a/board/gaisler/gr_cpci_ax2000/u-boot.lds +++ b/board/gaisler/gr_cpci_ax2000/u-boot.lds @@ -61,7 +61,7 @@ SECTIONS *(.start) cpu/leon3/start.o (.text) -/* 8k is the same as the PROM offset from end of main memory, (CFG_PROM_SIZE) */ +/* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, * no global data accesses please. diff --git a/board/gaisler/gr_ep2s60/u-boot.lds b/board/gaisler/gr_ep2s60/u-boot.lds index 100350d..e461a36 100644 --- a/board/gaisler/gr_ep2s60/u-boot.lds +++ b/board/gaisler/gr_ep2s60/u-boot.lds @@ -61,7 +61,7 @@ SECTIONS *(.start) cpu/leon3/start.o (.text) -/* 8k is the same as the PROM offset from end of main memory, (CFG_PROM_SIZE) */ +/* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, * no global data accesses please. diff --git a/board/gaisler/gr_xc3s_1500/u-boot.lds b/board/gaisler/gr_xc3s_1500/u-boot.lds index 3848c68..ddd27d4 100644 --- a/board/gaisler/gr_xc3s_1500/u-boot.lds +++ b/board/gaisler/gr_xc3s_1500/u-boot.lds @@ -61,7 +61,7 @@ SECTIONS *(.start) cpu/leon3/start.o (.text) -/* 8k is the same as the PROM offset from end of main memory, (CFG_PROM_SIZE) */ +/* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, * no global data accesses please. diff --git a/board/gaisler/grsim/u-boot.lds b/board/gaisler/grsim/u-boot.lds index 1e8bb69..a9cc7ca 100644 --- a/board/gaisler/grsim/u-boot.lds +++ b/board/gaisler/grsim/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS *(.start) cpu/leon3/start.o (.text) -/* 8k is the same as the PROM offset from end of main memory, (CFG_PROM_SIZE) */ +/* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, * no global data accesses please. diff --git a/board/gaisler/grsim_leon2/u-boot.lds b/board/gaisler/grsim_leon2/u-boot.lds index 2a22082..b3462d4 100644 --- a/board/gaisler/grsim_leon2/u-boot.lds +++ b/board/gaisler/grsim_leon2/u-boot.lds @@ -60,7 +60,7 @@ SECTIONS *(.start) cpu/leon2/start.o (.text) -/* 8k is the same as the PROM offset from end of main memory, (CFG_PROM_SIZE) */ +/* 8k is the same as the PROM offset from end of main memory, (CONFIG_SYS_PROM_SIZE) */ . = ALIGN(8192); /* PROM CODE, Will be relocated to the end of memory, * no global data accesses please. |