[U-Boot] Fwd: this eco is boomin for me
hello , I know that youre always working all the time... I ran across this news article that I think can really help you out. The article describes ways you can earn more cash on the net. It's easier than it sounds. You should really read it for yourself and make like 700 a day like me: a href=http://bit.ly/hxtrxJ;Review the news site/a ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] About uClinux auto start ?
2010/11/24 wzc0066 wzc0...@gmail.com The env set as below: bootcmd=run flashboot flashboot=sf probe 1; sf read 0x100 0x3 0x32; bootm 0x100 After enter the uboot console, uClinux can be started by command boot; but after power on (reset) the board, the error info is: * * *SF: Detected M25P32 with page size 256, total 4 MiB* *4096 KiB M25P32 at 0:1 is now current device* *Wrong Image Format for bootm command* *ERROR: can't get kernel image!* So how to setup to make sure uClinux could be auto started after power on ? The 'boot' command will run the 'bootcmd', read kernel image to memory then start it. If 'bootm' can works well, it need to copy kernel image to memory first, too. but actuality it's not, so is there a way to print out the exactly string which 'bootm' have executed ? -- wzc0066 -- wzc0066 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] RFC: missing patch review for LL TEMAC driver to u-boot
Stephan Linz wrote: Am Mittwoch, 17. November 2010, um 13:15:24 schrieb Stephan Linz: Hi Michal, --snip-- @Michal: Where can I find the latest commit for cherry-pick? You can look at this. http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=summary Thank you very much for your fast reaction. I'll try out the new implementation on my SP3ADSP1800 and ML605 and ACK here on u-boot list. Give me time until Friday. Hi Michal, thanks again. I've to fixed some bugs. The corresponding patches I will send in a separeted e-mail. Watch the mailing list / your inbox. Now most things are working (see dump below) but sometimes I get more or less LEN messages (ex.: len bad 156 208). Can you confirm this? I think it is not a problem with the driver, or not? IMHO it has connection with your lan traffic. U-boot expect specific packet len but got different one. Haven't had time to look your changes but hopefully I'll look at it hopefully soon. Michal U-Boot-mONStR dhcp 0x2090 /ml605/linuximage.ub Xilinx_LL_TEMAC: Xilinx XPS LocalLink Tri-Mode Ether MAC #0 at 0x88F0. Looking for phy ... OK Waiting for link ... OK 100BASE-T/FD BOOTP broadcast 1 DHCP client bound to address 192.168.10.175 Using Xilinx_LL_TEMAC device TFTP from server 192.168.10.10; our IP address is 192.168.10.175 Filename '/ml605/linuximage.ub'. Load address: 0x2090 Loading: # # # # # # # # ## done Bytes transferred = 7837764 (779844 hex) -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] usb: fix usb start problem with SMSC USB hub and Toshiba USB stick
Hi Remy, On Tue, 02 Nov 2010 21:46:33 +0100 Wolfgang Denk w...@denx.de wrote: Dear Remy Bohmer, In message aanlktik0bxxfe8d5+96gy_=+cu0h_fkeyutfyo=cr...@mail.gmail.com you wrote: As U-boot project-owner you know you have the last word in this. This is a pretty precious resource that should be used wisely, and not without real need. This topic is clearly in your domain, and while I'm trying to explain the situation to you, I will not try to influence your decision. I just wanted to ask, what is your final decision on this patch after this discusion. Do you NACK it an we should find the real issue and fix it accordingly? Or can you accept this patch as is? How do you think how to continue from here? I don't really know. There should be a difference in controlling the devices triggering the bug, and without hispeed analyser it will be extremely hard to find. We have one here, but we do not have your boards, USB hub/devices and so on. (And... neither do I have the time to debug it for you...) Nobody expects that you spend time and resources (and for free) on such a pretty exotic issue. Thanks, Anatolij ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/2] usb: fix usb start problem with SMSC USB hub and Toshiba USB stick
Dear Anatolij, In message 20101125111729.3ce4f...@wker you wrote: I just wanted to ask, what is your final decision on this patch after this discusion. Do you NACK it an we should find the real issue and fix it accordingly? Or can you accept this patch as is? I'm afraid we have neither time nor resources to spend any significant efforts on this - from the customer's point of view the problem is solved. He is fine with the out-of-tree patch, but of course this is highly dissatisfying. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Look! There! Evil!.. pure and simple, total evil from the Eighth Dimension! - Buckaroo Banzai ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Mathematics operation on uboot variables
Hi Eran, Is there any way to use mathematics operation on uboot environment or uboot local variables? since $varA+$varB and $(varA+varB) just save the string. You need to include CONFIG_CMD_SETEXPR in your configuration for such a functionality. See common/cmd_setexpr.c. Cheers Detlev -- Q: What is a compact city? A: It's a city that can be guarded by finitely many near-sighted policemen. -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: d...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Bad FIT image found
I'm trying to boot my rtos OSE with the bootm command but it fails. I have made a uimage for the rtos and download it to the target at address 0x100. I've also downloaded a flat device tree blob to address 0x40. u-boot says = bootm 0x100 - 0x40 WARNING: adjusting available memory to 3000 ## Booting kernel from Legacy Image at 0100 ... Image Name: kalle Image Type: PowerPC Linux Kernel Image (uncompressed) Data Size:3232544 Bytes = 3.1 MB Load Address: 0020 Entry Point: 0020 Verifying Checksum ... OK ## Flattened Device Tree blob at 0040 Booting using the fdt blob at 0x40 Loading Kernel Image ... OK OK ERROR: image is not a fdt - must RESET the board to recover. U-Boot 2009.11-2-g56804ff (May 14 2010 - 09:57:11) When I do fdt header on the blob u-boot says = fdt header magic: 0xd00dfeed totalsize: 0xa34a (41802) off_dt_struct: 0x38 off_dt_strings: 0x8df4 off_mem_rsvmap: 0x28 version:17 last_comp_version: 16 boot_cpuid_phys:0x0 size_dt_strings:0x556 size_dt_struct: 0x8dbc number mem_rsv: 0x0 That looks OK to me. When I do iminfo on the blob u-boot says = iminfo ## Checking Image at 0040 ... FIT image found Bad FIT image format! Can anyone tell me what the problem is? Leif Sörman Software Engineer RD OSE Labs Core Enea Skalholtsgatan 9, Box 1033, SE-164 21 Kista, Sweden Direct: +46 8 5071 4218 Mobile: +46 70 971 4218 leif.sor...@enea.com www.enea.com This message, including attachments, is CONFIDENTIAL. It may also be privileged or otherwise protected by law. If you received this email by mistake please let us know by reply and then delete it from your system; you should not copy it or disclose its contents to anyone. image001.gifimage002.jpg___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 01/24] 0000-Address-partial-linking-issues
The switch from archive libraries to partial linking has introduced a number of problems, that are non-trivial to solve. For example, it is no longer possible to include individual object files in the linker script as we did before for example in the case of boards with embedded environment to fill up the gap caused by the need to align the environment on flash erase block boundaries. The best (but unfortunately not easiest) approach to address this problem is probably to enable -ffunction-sections (and -ffunction-sections) so we can again (and even in much finer granularity) place certain code where we want it. When doing this step, it seems only consequent to also add --gc-sections which has the added benefit of reducing the memory footprint of the U-Boot image (both in flash and in RAM). Unfortunately, this requires changes to a lot of linker scripts. The following patch series prepares the groung a bit, then enables --gc-sections, -ffunction-sections and -ffunction-sections for the Power Architecture, and then starts to make all PowerPC boards build again, beginning with 4xx. As it turns out, this process uncovers a number of (so far undetected) bugs that have crept in over time, which I try to fix as well. Some of the patches have been posted before [1]; I try mark repostings in the Subject, but essentially it's a pretty complete rework. [1] - http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/89401 At the moment there is still an issue with some (all?) NAND booting 83xx boards, which generate 4 GB NAND images which is most likely not correct ;-) -- Kim, can you please have a look what's happening? Thanks. Note: these patches are also available in the gc-sections branch of the u-boot-testing repository. Overview: = Subject: [PATCH 01/24] ERIC: drop unsupported board configuration CREDITS|4 - MAINTAINERS|2 - board/eric/Makefile| 51 --- board/eric/eric.c | 203 - board/eric/eric.h | 44 -- board/eric/flash.c | 1131 board/eric/init.S | 359 --- boards.cfg |1 - doc/README.scrapyard |3 +- include/configs/ERIC.h | 369 10 files changed, 2 insertions(+), 2165 deletions(-) delete mode 100644 board/eric/Makefile delete mode 100644 board/eric/eric.c delete mode 100644 board/eric/eric.h delete mode 100644 board/eric/flash.c delete mode 100644 board/eric/init.S delete mode 100644 include/configs/ERIC.h Subject: [PATCH 02/24] barco: drop unsupported board configuration CREDITS |5 - board/barco/Makefile | 44 board/barco/README | 11 - board/barco/barco.c | 344 -- board/barco/barco_svc.h | 68 - board/barco/early_init.S | 153 board/barco/flash.c | 611 -- board/barco/speed.h | 78 -- boards.cfg |1 - doc/README.scrapyard |3 +- include/configs/barco.h | 364 --- 11 files changed, 2 insertions(+), 1680 deletions(-) delete mode 100644 board/barco/Makefile delete mode 100644 board/barco/README delete mode 100644 board/barco/barco.c delete mode 100644 board/barco/barco_svc.h delete mode 100644 board/barco/early_init.S delete mode 100644 board/barco/flash.c delete mode 100644 board/barco/speed.h delete mode 100644 include/configs/barco.h Subject: [PATCH 03/24] e1000: fix compile warning drivers/net/e1000.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Subject: [PATCH 04/24] IDS8247: remove redundant flash.c file board/ids8247/Makefile |2 +- board/ids8247/flash.c | 484 2 files changed, 1 insertions(+), 485 deletions(-) delete mode 100644 board/ids8247/flash.c Subject: [PATCH 05/24] WINBOND_83C553: enable only on boards that actually use it. arch/powerpc/lib/board.c|2 +- include/configs/HIDDEN_DRAGON.h |2 +- include/configs/Sandpoint8240.h |2 +- include/configs/Sandpoint8245.h |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Subject: [PATCH 06/24] cam5200_niosflash: fix build warnings board/tqc/tqm5200/cam5200_flash.c |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) Subject: [PATCH 07/24 V2] common/Makefile: don't include env_embedded.o into libcommon common/Makefile | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) Subject: [PATCH 08/24 V2] cpu/ppc4xx/Makefile: build only needed object files arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c |4 --- arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c |3 -- arch/powerpc/cpu/ppc4xx/Makefile | 25 - 3 files changed, 10 insertions(+), 22 deletions(-) Subject: [PATCH 09/24 V2] arch/powerpc/*/config.mk: make CONFIG_SYS_LDSCRIPT settings work
[U-Boot] [PATCH 03/24] e1000: fix compile warning
Get rid of compiler warning:
e1000.c: In function 'e1000_transmit':
e1000.c:5028: warning: passing argument 1 of 'virt_to_phys' discards qualifiers
from pointer target type
Signed-off-by: Wolfgang Denk w...@denx.de
---
drivers/net/e1000.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 60b04c2..5f390bd 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5018,6 +5018,7 @@ TRANSMIT - Transmit a frame
static int
e1000_transmit(struct eth_device *nic, volatile void *packet, int length)
{
+ void * nv_packet = (void *)packet;
struct e1000_hw *hw = nic-priv;
struct e1000_tx_desc *txp;
int i = 0;
@@ -5025,7 +5026,7 @@ e1000_transmit(struct eth_device *nic, volatile void
*packet, int length)
txp = tx_base + tx_tail;
tx_tail = (tx_tail + 1) % 8;
- txp-buffer_addr = cpu_to_le64(virt_to_bus(hw-pdev, packet));
+ txp-buffer_addr = cpu_to_le64(virt_to_bus(hw-pdev, nv_packet));
txp-lower.data = cpu_to_le32(hw-txd_cmd | length);
txp-upper.data = 0;
E1000_WRITE_REG(hw, TDT, tx_tail);
--
1.7.3.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 04/24] IDS8247: remove redundant flash.c file
The IDS8247 board is configured to use the CFI flash driver, so drop
the now redundant custom flash.c file.
Signed-off-by: Wolfgang Denk w...@denx.de
---
board/ids8247/Makefile |2 +-
board/ids8247/flash.c | 484
2 files changed, 1 insertions(+), 485 deletions(-)
delete mode 100644 board/ids8247/flash.c
diff --git a/board/ids8247/Makefile b/board/ids8247/Makefile
index 032e0a7..2b702ce 100644
--- a/board/ids8247/Makefile
+++ b/board/ids8247/Makefile
@@ -28,7 +28,7 @@ include $(TOPDIR)/config.mk
LIB= $(obj)lib$(BOARD).o
-COBJS = $(BOARD).o flash.o
+COBJS = $(BOARD).o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS))
diff --git a/board/ids8247/flash.c b/board/ids8247/flash.c
deleted file mode 100644
index 5107553..000
--- a/board/ids8247/flash.c
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
- * (C) Copyright 2005
- * Heiko Schocher, DENX Software Engineering, h...@denx.de
- *
- * (C) Copyright 2001
- * Kyle Harris, Nexus Technologies, Inc. khar...@nexus-tech.net
- *
- * (C) Copyright 2001-2005
- * Wolfgang Denk, DENX Software Engineering, w...@denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#undef DEBUG
-
-#include common.h
-
-flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips
*/
-
-#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef CONFIG_ENV_ADDR
-# define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
-# endif
-# ifndef CONFIG_ENV_SIZE
-# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
-# endif
-# ifndef CONFIG_ENV_SECT_SIZE
-# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
-# endif
-#endif
-
-/*---
- * Protection Flags:
- */
-#define FLAG_PROTECT_SET 0x01
-#define FLAG_PROTECT_CLEAR 0x02
-
-/* Board support for 1 or 2 flash devices */
-#undef FLASH_PORT_WIDTH32
-#undef FLASH_PORT_WIDTH16
-#define FLASH_PORT_WIDTH8
-
-#ifdef FLASH_PORT_WIDTH16
-#define FLASH_PORT_WIDTH ushort
-#define FLASH_PORT_WIDTHV vu_short
-#elif FLASH_PORT_WIDTH32
-#define FLASH_PORT_WIDTH ulong
-#define FLASH_PORT_WIDTHV vu_long
-#else /* FLASH_PORT_WIDTH8 */
-#define FLASH_PORT_WIDTH uchar
-#define FLASH_PORT_WIDTHV vu_char
-#endif
-
-#define FPWFLASH_PORT_WIDTH
-#define FPWV FLASH_PORT_WIDTHV
-
-/*---
- * Functions
- */
-static ulong flash_get_size (FPWV * addr, flash_info_t * info);
-static int write_data (flash_info_t * info, ulong dest, FPW data);
-static void flash_get_offsets (ulong base, flash_info_t * info);
-
-/*---
- */
-
-unsigned long flash_init (void)
-{
- unsigned long size_b0;
- int i;
- volatile immap_t * immr = (immap_t *)CONFIG_SYS_IMMR;
- volatile memctl8260_t *memctl = immr-im_memctl;
-
- /* Init: no FLASHes known */
- for (i = 0; i CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
- flash_info[i].flash_id = FLASH_UNKNOWN;
- }
-
- /* Static FLASH Bank configuration here - FIXME XXX */
- size_b0 = flash_get_size ((FPW *) CONFIG_SYS_FLASH0_BASE,
flash_info[0]);
-
- if (flash_info[0].flash_id == FLASH_UNKNOWN) {
- printf (## Unknown FLASH on Bank 0 - Size = 0x%08lx = %ld
MB\n,
- size_b0, size_b0 20);
- }
-
- memctl-memc_or0 = 0xff800060;
- memctl-memc_br0 = 0xff800801;
-
- flash_get_offsets (0xff80, flash_info[0]);
-
-#if CONFIG_SYS_MONITOR_BASE = CONFIG_SYS_FLASH_BASE
- /* monitor protection ON by default */
- (void) flash_protect (FLAG_PROTECT_SET,
- CONFIG_SYS_MONITOR_BASE,
- CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1,
- flash_info[0]);
-#endif
-
-#ifdef CONFIG_ENV_IS_IN_FLASH
- /* ENV protection ON by default */
- flash_protect (FLAG_PROTECT_SET,
- CONFIG_ENV_ADDR,
- CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
-
[U-Boot] [PATCH 06/24] cam5200_niosflash: fix build warnings
Fix warnings:
cam5200_flash.c: In function 'write_word_32':
cam5200_flash.c:443: warning: dereferencing type-punned pointer will break
strict-aliasing rules
cam5200_flash.c: In function 'write_word_16':
cam5200_flash.c:684: warning: dereferencing type-punned pointer will break
strict-aliasing rules
Signed-off-by: Wolfgang Denk w...@denx.de
---
board/tqc/tqm5200/cam5200_flash.c |8 ++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/board/tqc/tqm5200/cam5200_flash.c
b/board/tqc/tqm5200/cam5200_flash.c
index 124b47d..4c8922f 100644
--- a/board/tqc/tqm5200/cam5200_flash.c
+++ b/board/tqc/tqm5200/cam5200_flash.c
@@ -440,7 +440,9 @@ static int write_word(flash_info_t * info, ulong dest,
ulong data)
{
volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2 =
(CONFIG_SYS_FLASH_WORD_SIZE *) (info-start[0]);
volatile CONFIG_SYS_FLASH_WORD_SIZE *dest2 =
(CONFIG_SYS_FLASH_WORD_SIZE *) dest;
- volatile CONFIG_SYS_FLASH_WORD_SIZE *data2 =
(CONFIG_SYS_FLASH_WORD_SIZE *) data;
+ ulong *datap = data;
+ volatile CONFIG_SYS_FLASH_WORD_SIZE *data2 =
+ (volatile CONFIG_SYS_FLASH_WORD_SIZE *)datap;
ulong start;
int i, flag;
@@ -681,7 +683,9 @@ static int write_word_16(flash_info_t * info, ulong dest,
ulong data)
{
volatile CONFIG_SYS_FLASH_WORD_SIZE *addr2 =
(CONFIG_SYS_FLASH_WORD_SIZE *) (info-start[0]);
volatile CONFIG_SYS_FLASH_WORD_SIZE *dest2 =
(CONFIG_SYS_FLASH_WORD_SIZE *) dest;
- volatile CONFIG_SYS_FLASH_WORD_SIZE *data2 =
(CONFIG_SYS_FLASH_WORD_SIZE *) data;
+ ulong *datap = data;
+ volatile CONFIG_SYS_FLASH_WORD_SIZE *data2 =
+ (volatile CONFIG_SYS_FLASH_WORD_SIZE *)datap;
ulong start;
int i;
--
1.7.3.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 14/24 V2] ppc4xx/NAND: Reduce size of NAND SPL image
From: Stefan Roese s...@denx.de This is needed for the canyonlands_nand build target. Without it the resulting image won't fit into 4k. Signed-off-by: Stefan Roese s...@denx.de Cc: Scott Wood scottw...@freescale.com Acked-by: Scott Wood scottw...@freescale.com --- Stefan, if it's OK with you I will pull this directly. drivers/mtd/nand/ndfc.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c index 3ca13a9..0729e0c 100644 --- a/drivers/mtd/nand/ndfc.c +++ b/drivers/mtd/nand/ndfc.c @@ -201,6 +201,8 @@ int board_nand_init(struct nand_chip *nand) #ifndef CONFIG_NAND_SPL nand-write_buf = ndfc_write_buf; nand-verify_buf = ndfc_verify_buf; + + chip++; #else /* * Setup EBC (CS0 only right now) @@ -211,7 +213,5 @@ int board_nand_init(struct nand_chip *nand) mtebc(PB0AP, CONFIG_SYS_EBC_PB0AP); #endif - chip++; - return 0; } -- 1.7.3.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 23/24 V2] 8260: Cleanup for partial linking and --gc-sections
Signed-off-by: Wolfgang Denk w...@denx.de
---
arch/powerpc/cpu/mpc8260/u-boot.lds | 56 +++
board/atc/ti113x.c |4 +-
board/cogent/u-boot.lds |6 +++-
include/configs/cogent_mpc8260.h|2 +-
4 files changed, 19 insertions(+), 49 deletions(-)
diff --git a/arch/powerpc/cpu/mpc8260/u-boot.lds
b/arch/powerpc/cpu/mpc8260/u-boot.lds
index b8681e7..ad2ce37 100644
--- a/arch/powerpc/cpu/mpc8260/u-boot.lds
+++ b/arch/powerpc/cpu/mpc8260/u-boot.lds
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2001-2007
+ * (C) Copyright 2001-2010
* Wolfgang Denk, DENX Software Engineering, w...@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -22,46 +22,17 @@
*/
OUTPUT_ARCH(powerpc)
-/* Do we need any of these for elf?
- __DYNAMIC = 0;*/
+
SECTIONS
{
/* Read-only sections, merged into text segment: */
- . = + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym)}
- .dynstr: { *(.dynstr)}
- .rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
- .rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata: { *(.rel.rodata)}
- .rela.rodata : { *(.rela.rodata) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors: { *(.rela.ctors)}
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors: { *(.rela.dtors)}
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init : { *(.init) }
- .plt : { *(.plt) }
.text :
{
-arch/powerpc/cpu/mpc8260/start.o (.text)
-*(.text)
-*(.got1)
+arch/powerpc/cpu/mpc8260/start.o (.text*)
+*(.text*)
. = ALIGN(16);
-*(.eh_frame)
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
- .fini : { *(.fini)} =0
- .ctors : { *(.ctors) }
- .dtors : { *(.dtors) }
/* Read-write section, merged into data segment: */
. = (. + 0x0FFF) 0xF000;
@@ -69,23 +40,19 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
-*(.got)
+KEEP(*(.got))
_GOT2_TABLE_ = .;
-*(.got2)
+KEEP(*(.got2))
_FIXUP_TABLE_ = .;
-*(.fixup)
+KEEP(*(.fixup))
}
__got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2;
__fixup_entries = (. - _FIXUP_TABLE_) 2;
.data:
{
-*(.data)
-*(.data1)
-*(.sdata)
-*(.sdata2)
-*(.dynamic)
-CONSTRUCTORS
+*(.data*)
+*(.sdata*)
}
_edata = .;
PROVIDE (edata = .);
@@ -111,9 +78,8 @@ SECTIONS
__bss_start = .;
.bss (NOLOAD) :
{
- *(.sbss) *(.scommon)
- *(.dynbss)
- *(.bss)
+ *(.bss*)
+ *(.sbss*)
*(COMMON)
. = ALIGN(4);
}
diff --git a/board/atc/ti113x.c b/board/atc/ti113x.c
index 473bb10..ff871f6 100644
--- a/board/atc/ti113x.c
+++ b/board/atc/ti113x.c
@@ -468,7 +468,7 @@ static int i365_set_io_map (socket_info_t * s, struct
pccard_io_map *io)
/**/
-int i82365_init (void)
+static int i82365_init (void)
{
u_int val;
int i;
@@ -545,7 +545,7 @@ int i82365_init (void)
return 0;
}
-void i82365_exit (void)
+static void i82365_exit (void)
{
io.map = 0;
io.flags = 0;
diff --git a/board/cogent/u-boot.lds b/board/cogent/u-boot.lds
index b4c7a0e..42ed142 100644
--- a/board/cogent/u-boot.lds
+++ b/board/cogent/u-boot.lds
@@ -21,6 +21,7 @@
* MA 02111-1307 USA
*/
+#include config.h
OUTPUT_ARCH(powerpc)
SECTIONS
@@ -29,9 +30,12 @@ SECTIONS
. = + SIZEOF_HEADERS;
.text :
{
+#ifdef CONFIG_MPC8260
+arch/powerpc/cpu/mpc8260/start.o (.text*)
+#else
arch/powerpc/cpu/mpc8xx/start.o(.text*)
arch/powerpc/cpu/mpc8xx/traps.o(.text*)
-
+#endif
*(.text*)
}
_etext = .;
diff --git a/include/configs/cogent_mpc8260.h b/include/configs/cogent_mpc8260.h
index d77af0d..2997f52 100644
--- a/include/configs/cogent_mpc8260.h
+++ b/include/configs/cogent_mpc8260.h
@@ -108,7 +108,7 @@
#define CONFIG_CMD_KGDB
#undef CONFIG_CMD_NET
-
+#undef CONFIG_CMD_NFS
#ifdef DEBUG
#define CONFIG_BOOTDELAY -1 /* autoboot disabled*/
--
1.7.3.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 18/24 V2] 5xx: Cleanup for partial linking and --gc-sections
Signed-off-by: Wolfgang Denk w...@denx.de
---
arch/powerpc/cpu/mpc5xx/u-boot.lds | 69 ---
include/configs/cmi_mpc5xx.h |1 +
2 files changed, 17 insertions(+), 53 deletions(-)
diff --git a/arch/powerpc/cpu/mpc5xx/u-boot.lds
b/arch/powerpc/cpu/mpc5xx/u-boot.lds
index d5e5dc1..b7fd4bc 100644
--- a/arch/powerpc/cpu/mpc5xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc5xx/u-boot.lds
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2001 Wolfgang Denk, DENX Software Engineering, w...@denx.de
+ * (C) Copyright 2001-2010 Wolfgang Denk, DENX Software Engineering,
w...@denx.de
* (C) Copyright 2003 Martin Winistoerfer, martinwinistoer...@gmx.ch
*
* See file CREDITS for list of people who contributed to this
@@ -22,54 +22,23 @@
*/
OUTPUT_ARCH(powerpc)
-/* Do we need any of these for elf?
- __DYNAMIC = 0;*/
+
SECTIONS
{
/* Read-only sections, merged into text segment: */
. = + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym)}
- .dynstr: { *(.dynstr)}
- .rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
- .rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata: { *(.rel.rodata)}
- .rela.rodata : { *(.rela.rodata) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors: { *(.rela.ctors)}
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors: { *(.rela.dtors)}
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init : { *(.init) }
- .plt : { *(.plt) }
.text :
{
-/* WARNING - the following is hand-optimized to fit within */
-/* the sector layout of our flash chips! XXX FIXME XXX */
-
-arch/powerpc/cpu/mpc5xx/start.o(.text)
+arch/powerpc/cpu/mpc5xx/start.o(.text*)
-*(.text)
-*(.got1)
+*(.text*)
}
_etext = .;
PROVIDE (etext = .);
.rodata:
{
-*(.eh_frame)
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
- .fini : { *(.fini)} =0
- .ctors : { *(.ctors) }
- .dtors : { *(.dtors) }
/* Read-write section, merged into data segment: */
. = (. + 0x00FF) 0xFF00;
@@ -77,23 +46,19 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
-*(.got)
+KEEP(*(.got))
_GOT2_TABLE_ = .;
-*(.got2)
+KEEP(*(.got2))
_FIXUP_TABLE_ = .;
-*(.fixup)
+KEEP(*(.fixup))
}
__got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2;
__fixup_entries = (. - _FIXUP_TABLE_)2;
.data:
{
-*(.data)
-*(.data1)
-*(.sdata)
-*(.sdata2)
-*(.dynamic)
-CONSTRUCTORS
+*(.data*)
+*(.sdata*)
}
_edata = .;
PROVIDE (edata = .);
@@ -119,19 +84,17 @@ SECTIONS
__bss_start = .;
.bss (NOLOAD) :
{
- *(.sbss) *(.scommon)
- *(.dynbss)
- *(.bss)
+ *(.bss*)
+ *(.sbss*)
*(COMMON)
. = ALIGN(4);
}
_end = . ;
PROVIDE (end = .);
-/* . = env_start;
- .ppcenv :
- {
- common/env_embedded.o (.ppcenv)
- }
-*/
+ . = env_start;
+ .ppcenv :
+ {
+common/env_embedded.o (.ppcenv)
+ }
}
diff --git a/include/configs/cmi_mpc5xx.h b/include/configs/cmi_mpc5xx.h
index 198f342..329e4e3 100644
--- a/include/configs/cmi_mpc5xx.h
+++ b/include/configs/cmi_mpc5xx.h
@@ -62,6 +62,7 @@
#include config_cmd_default.h
#undef CONFIG_CMD_NET /* disabeled - causes compile errors */
+#undef CONFIG_CMD_NFS
#define CONFIG_CMD_MEMORY
#define CONFIG_CMD_LOADB
--
1.7.3.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 09/24 V2] arch/powerpc/*/config.mk: make CONFIG_SYS_LDSCRIPT settings work
As we try to get rid of board specific config.mk files we must provide a way for board specific settings of the LDSCRIPT variable (path to the linker script) where needed. We now implement the following hierarchy: - Highest priority has a #define CONFIG_SYS_LDCONFIG in the board config file. - If CONFIG_SYS_LDCONFIG is not set, and the system is booting from NAND (CONFIG_NAND_U_BOOT is set), then a board specific linker script board/$(BOARDDIR)/u-boot-nand.lds gets use. - If we are not booting from NAND, we test if a processor specific linker script arch/powerpc/cpu/$(CPU)/u-boot.lds exists; if so we use that. - As default, arch/powerpc/config.mk gets used. Signed-off-by: Wolfgang Denk w...@denx.de Cc: Stefan Roese s...@denx.de Cc: Kim Phillips kim.phill...@freescale.com Cc: Kumar Gala kumar.g...@freescale.com Cc: Andy Fleming aflem...@gmail.com --- arch/powerpc/config.mk | 13 - arch/powerpc/cpu/mpc512x/config.mk |7 ++- arch/powerpc/cpu/mpc5xx/config.mk | 10 -- arch/powerpc/cpu/mpc5xxx/config.mk |5 + arch/powerpc/cpu/mpc8220/config.mk |5 + arch/powerpc/cpu/mpc824x/config.mk |5 + arch/powerpc/cpu/mpc8260/config.mk |5 + arch/powerpc/cpu/mpc83xx/config.mk |3 --- arch/powerpc/cpu/mpc85xx/config.mk |3 --- arch/powerpc/cpu/mpc86xx/config.mk |7 --- arch/powerpc/cpu/mpc8xx/config.mk |2 +- arch/powerpc/cpu/ppc4xx/config.mk |5 + 12 files changed, 20 insertions(+), 50 deletions(-) diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index 06a3b10..5bc849c 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2000-2002 +# (C) Copyright 2000-2010 # Wolfgang Denk, DENX Software Engineering, w...@denx.de. # # See file CREDITS for list of people who contributed to this @@ -29,6 +29,17 @@ PLATFORM_RELFLAGS += -mrelocatable PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ PLATFORM_LDFLAGS += -n +ifdef CONFIG_SYS_LDSCRIPT +# need to strip off double quotes +LDSCRIPT := $(subst ,,$(CONFIG_SYS_LDSCRIPT)) +else ifdef CONFIG_NAND_SPL +LDSCRIPT := $(SRCTREE)/$(CONFIG_BOARDDIR)/u-boot-nand.lds +else +ifneq ($(wildcard $(SRCTREE)/arch/powerpc/cpu/$(CPU)/u-boot.lds),) +LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/$(CPU)/u-boot.lds +endif +endif + # # When cross-compiling on NetBSD, we have to define __PPC__ or else we # will pick up a va_list declaration that is incompatible with the diff --git a/arch/powerpc/cpu/mpc512x/config.mk b/arch/powerpc/cpu/mpc512x/config.mk index b29edb1..baf55cc 100644 --- a/arch/powerpc/cpu/mpc512x/config.mk +++ b/arch/powerpc/cpu/mpc512x/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2007-2009 DENX Software Engineering +# (C) Copyright 2007-2010 DENX Software Engineering # # See file CREDITS for list of people who contributed to this # project. @@ -19,11 +19,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # + PLATFORM_RELFLAGS += -fPIC -meabi PLATFORM_CPPFLAGS += -DCONFIG_MPC512X -DCONFIG_E300 \ -ffixed-r2 -msoft-float -mcpu=603e - -# Use default linker script. -# A board port can override this setting in board/*/config.mk -LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc512x/u-boot.lds diff --git a/arch/powerpc/cpu/mpc5xx/config.mk b/arch/powerpc/cpu/mpc5xx/config.mk index 5f9285d..1c7df00 100644 --- a/arch/powerpc/cpu/mpc5xx/config.mk +++ b/arch/powerpc/cpu/mpc5xx/config.mk @@ -21,16 +21,6 @@ # MA 02111-1307 USA # -# -# File:config.mk -# -# Discription: compiler flags and make definitions -# - - PLATFORM_RELFLAGS += -fPIC -meabi PLATFORM_CPPFLAGS += -DCONFIG_5xx -ffixed-r2 -mpowerpc -msoft-float - -# Use default linker script. Board port can override in board/*/config.mk -LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xx/u-boot.lds diff --git a/arch/powerpc/cpu/mpc5xxx/config.mk b/arch/powerpc/cpu/mpc5xxx/config.mk index 7ef8a47..832909f 100644 --- a/arch/powerpc/cpu/mpc5xxx/config.mk +++ b/arch/powerpc/cpu/mpc5xxx/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2003 +# (C) Copyright 2003-2010 # Wolfgang Denk, DENX Software Engineering, w...@denx.de. # # See file CREDITS for list of people who contributed to this @@ -25,6 +25,3 @@ PLATFORM_RELFLAGS += -fPIC -meabi PLATFORM_CPPFLAGS += -DCONFIG_MPC5xxx -ffixed-r2 \ -mstring -mcpu=603e -mmultiple - -# Use default linker script. Board port can override in board/*/config.mk -LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot.lds diff --git a/arch/powerpc/cpu/mpc8220/config.mk b/arch/powerpc/cpu/mpc8220/config.mk index e706883..9142b91 100644 --- a/arch/powerpc/cpu/mpc8220/config.mk +++ b/arch/powerpc/cpu/mpc8220/config.mk @@ -1,5 +1,5 @@ # -# (C) Copyright 2003 +# (C) Copyright 2003-2010 # Wolfgang Denk, DENX Software Engineering, w...@denx.de. # # See file CREDITS for list of people who contributed to this @@ -25,6 +25,3 @@
[U-Boot] [PATCH 10/24 V2] PPChameleonEVB and CATcenter need a custom linker script
These boards use an embedded environment, which is not supported by the
generic arch/powerpc/cpu/ppc4xx/u-boot.lds script.
The breakage was introduced by commit 2cd95a2 ppc4xx: Remove board
specific linker scripts from most PPC4xx boards
Signed-off-by: Wolfgang Denk w...@denx.de
Cc: Stefan Roese s...@denx.de
Cc: Andrea Marson andrea.mar...@dave-tech.it
---
Stefan, if it's OK with you I will pull this directly.
board/dave/PPChameleonEVB/u-boot.lds | 128 ++
include/configs/CATcenter.h |1 +
include/configs/PPChameleonEVB.h |1 +
3 files changed, 130 insertions(+), 0 deletions(-)
create mode 100644 board/dave/PPChameleonEVB/u-boot.lds
diff --git a/board/dave/PPChameleonEVB/u-boot.lds
b/board/dave/PPChameleonEVB/u-boot.lds
new file mode 100644
index 000..17f5919
--- /dev/null
+++ b/board/dave/PPChameleonEVB/u-boot.lds
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2007-2009 Freescale Semiconductor, Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include config.h/* CONFIG_BOARDDIR */
+
+#ifndef RESET_VECTOR_ADDRESS
+#define RESET_VECTOR_ADDRESS 0xfffc
+#endif
+
+OUTPUT_ARCH(powerpc)
+
+PHDRS
+{
+ text PT_LOAD;
+ bss PT_LOAD;
+}
+
+SECTIONS
+{
+ /* Read-only sections, merged into text segment: */
+ . = + SIZEOF_HEADERS;
+ .text :
+ {
+*(.text*)
+ } :text
+_etext = .;
+PROVIDE (etext = .);
+.rodata:
+ {
+*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+ } :text
+
+ /* Read-write section, merged into data segment: */
+ . = (. + 0x00FF) 0xFF00;
+ _erotext = .;
+ PROVIDE (erotext = .);
+ .reloc :
+ {
+KEEP(*(.got))
+_GOT2_TABLE_ = .;
+KEEP(*(.got2))
+_FIXUP_TABLE_ = .;
+KEEP(*(.fixup))
+ }
+ __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2;
+ __fixup_entries = (. - _FIXUP_TABLE_) 2;
+
+ .data:
+ {
+*(.data*)
+*(.sdata*)
+ }
+ _edata = .;
+ PROVIDE (edata = .);
+
+ . = .;
+ __u_boot_cmd_start = .;
+ .u_boot_cmd : { *(.u_boot_cmd) }
+ __u_boot_cmd_end = .;
+
+ . = .;
+ __start___ex_table = .;
+ __ex_table : { *(__ex_table) }
+ __stop___ex_table = .;
+
+ . = ALIGN(256);
+ __init_begin = .;
+ .text.init : { *(.text.init) }
+ .data.init : { *(.data.init) }
+ . = ALIGN(256);
+ __init_end = .;
+
+ ppcenv_assert = ASSERT(. 0x8000, .bss section too big, overlaps
.ppcenv section. Please update your confguration: CONFIG_SYS_MONITOR_BASE,
CONFIG_SYS_MONITOR_LEN and CONFIG_SYS_TEXT_BASE may need to be modified.);
+ . = 0x8000;
+ .ppcenv :
+ {
+common/env_embedded.o(.ppcenv);
+ }
+
+ .resetvec RESET_VECTOR_ADDRESS :
+ {
+KEEP(*(.resetvec))
+ } :text = 0x
+
+ . = RESET_VECTOR_ADDRESS + 0x4;
+
+ /*
+ * Make sure that the bss segment isn't linked at 0x0, otherwise its
+ * address won't be updated during relocation fixups. Note that
+ * this is a temporary fix. Code to dynamically the fixup the bss
+ * location will be added in the future. When the bss relocation
+ * fixup code is present this workaround should be removed.
+ */
+#if (RESET_VECTOR_ADDRESS == 0xfffc)
+ . |= 0x10;
+#endif
+
+ __bss_start = .;
+ .bss (NOLOAD) :
+ {
+ *(.bss*)
+ *(.sbss*)
+ *(COMMON)
+ } :bss
+
+ . = ALIGN(4);
+ _end = . ;
+ PROVIDE (end = .);
+}
diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h
index ac70d15..0b75a4e 100644
--- a/include/configs/CATcenter.h
+++ b/include/configs/CATcenter.h
@@ -76,6 +76,7 @@
#define CONFIG_PPCHAMELEONEVB 1 /* ...on a PPChameleonEVB board */
#defineCONFIG_SYS_TEXT_BASE0xFFFB /* Reserve 320 kB for
Monitor */
+#define CONFIG_SYS_LDSCRIPTboard/dave/PPChameleonEVB/u-boot.lds
#define CONFIG_BOARD_EARLY_INIT_F 1/* call board_early_init_f()*/
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r() */
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index a14bd0e..195925a 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -76,6 +76,7 @@
#define CONFIG_PPCHAMELEONEVB 1 /* ...on a PPChameleonEVB board */
#defineCONFIG_SYS_TEXT_BASE0xFFFB /*
[U-Boot] [PATCH 02/24] barco: drop unsupported board configuration
The barco board appears to be unmaintained since it was added about 5 years ago. The environment location has probably never been correct. Drop it. Signed-off-by: Wolfgang Denk w...@denx.de Cc: Marc Leeman marc.lee...@barco.com --- CREDITS |5 - board/barco/Makefile | 44 board/barco/README | 11 - board/barco/barco.c | 344 -- board/barco/barco_svc.h | 68 - board/barco/early_init.S | 153 board/barco/flash.c | 611 -- board/barco/speed.h | 78 -- boards.cfg |1 - doc/README.scrapyard |3 +- include/configs/barco.h | 364 --- 11 files changed, 2 insertions(+), 1680 deletions(-) delete mode 100644 board/barco/Makefile delete mode 100644 board/barco/README delete mode 100644 board/barco/barco.c delete mode 100644 board/barco/barco_svc.h delete mode 100644 board/barco/early_init.S delete mode 100644 board/barco/flash.c delete mode 100644 board/barco/speed.h delete mode 100644 include/configs/barco.h diff --git a/CREDITS b/CREDITS index 253abac..dacc5b4 100644 --- a/CREDITS +++ b/CREDITS @@ -278,11 +278,6 @@ N: Thomas Lange E: tho...@corelatus.se D: Support for GTH, GTH2 and dbau1x00 boards; lots of PCMCIA fixes -N: Marc Leeman -E: marc.lee...@barco.com -D: Support for Barco Streaming Video Card (SVC) and Sample Compress Network (SCN) -W: www.barco.com - N: The LEOX team E: t...@leox.org D: Support for LEOX boards, DS164x RTC diff --git a/board/barco/Makefile b/board/barco/Makefile deleted file mode 100644 index befc92a..000 --- a/board/barco/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -include $(TOPDIR)/config.mk - -LIB= $(obj)lib$(BOARD).o - -COBJS = $(BOARD).o flash.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB):$(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -# - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -# diff --git a/board/barco/README b/board/barco/README deleted file mode 100644 index d255a3d..000 --- a/board/barco/README +++ /dev/null @@ -1,11 +0,0 @@ -This port of U-Boot is tuned to run on a range of Barco Control Rooms -Streaming Video Solutions, including: - - - Streaming Video Card (SVC) - - Sample Compress Network (SCN) - -For more information, see http://www.barcocontrolrooms.com/ - -Code and configuration are originally based on the Sandpoint board - -Marc Leeman marc.lee...@barco.com diff --git a/board/barco/barco.c b/board/barco/barco.c deleted file mode 100644 index 263a288..000 --- a/board/barco/barco.c +++ /dev/null @@ -1,344 +0,0 @@ -/ - * - * Unless otherwise specified, Copyright (C) 2004-2005 Barco Control Rooms - * - * $Source: /home/services/cvs/firmware/ppc/u-boot-1.1.2/board/barco/barco.c,v $ - * $Revision: 1.4 $ - * $Author: mleeman $ - * $Date: 2005/03/02 16:40:20 $ - * - * Last ChangeLog Entry - * $Log: barco.c,v $ - * Revision 1.4 2005/03/02 16:40:20 mleeman - * remove empty labels (3.4 complains) - * - * Revision 1.3 2005/02/21 12:48:58 mleeman - * update of copyright years (feedback wd) - * - * Revision 1.2 2005/02/21 10:10:53 mleeman - * - split up switch statement to a function call (Linux kernel coding guidelines) - * ( feedback wd) - * - * Revision 1.1 2005/02/14 09:31:07 mleeman - * renaming of files - * - * Revision 1.1 2005/02/14 09:23:46 mleeman - * - moved 'barcohydra' directory to a more generic barco; since we will be - * supporting and adding multiple boards - * - * Revision 1.3 2005/02/10 13:57:32 mleeman - * fixed flash corruption: I should exit from the moment I find the correct value - * - * Revision 1.2 2005/02/09 12:56:23 mleeman - * add generic header to track
[U-Boot] [PATCH 07/24 V2] common/Makefile: don't include env_embedded.o into libcommon
Some boards use an embedded environment, where env_embedded.o has to be linked at a special position in the U-Boot image; to make this possible, we do not include it into libcommon.o for such boards. Signed-off-by: Mike Frysinger vap...@gentoo.org Signed-off-by: Wolfgang Denk w...@denx.de --- common/Makefile | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/Makefile b/common/Makefile index e0db382..abea91c 100644 --- a/common/Makefile +++ b/common/Makefile @@ -25,8 +25,6 @@ include $(TOPDIR)/config.mk LIB= $(obj)libcommon.o -AOBJS = - # core COBJS-y += main.o COBJS-y += console.o @@ -52,9 +50,9 @@ COBJS-y += cmd_version.o COBJS-y += env_common.o COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o -COBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o +XCOBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o -COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o +XCOBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o @@ -169,12 +167,14 @@ COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o COBJS := $(sort $(COBJS-y)) -SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(AOBJS) $(COBJS)) +XCOBJS := $(sort $(XCOBJS-y)) +SRCS := $(COBJS:.o=.c) $(XCOBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +XOBJS := $(addprefix $(obj),$(XCOBJS)) CPPFLAGS += -I.. -all: $(LIB) $(AOBJS) +all: $(LIB) $(XOBJS) $(LIB): $(obj).depend $(OBJS) $(call cmd_link_o_target, $(OBJS)) -- 1.7.3.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 08/24 V2] cpu/ppc4xx/Makefile: build only needed object files
Signed-off-by: Wolfgang Denk w...@denx.de
Cc: Stefan Roese s...@denx.de
---
Stefan, if it's OK with you I will pull this directly.
arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c |4 ---
arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c |3 --
arch/powerpc/cpu/ppc4xx/Makefile | 25 -
3 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
index cf9d66d..9634deb 100644
--- a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
+++ b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c
@@ -50,8 +50,6 @@
#include ecc.h
-#if defined(CONFIG_SDRAM_PPC4xx_IBM_DDR2)
-
#define PPC4xx_IBM_DDR2_DUMP_REGISTER(mnemonic)
\
do {\
u32 data; \
@@ -3194,5 +3192,3 @@ inline void ppc4xx_ibm_ddr2_register_dump(void)
PPC4xx_IBM_DDR2_DUMP_REGISTER(RTSR);
#endif /* defined(DEBUG) */
}
-
-#endif /* CONFIG_SDRAM_PPC4xx_IBM_DDR2 */
diff --git a/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
b/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
index e90c93e..b909fca 100644
--- a/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+++ b/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
@@ -44,8 +44,6 @@
#include ecc.h
-#if defined(CONFIG_PPC4xx_DDR_AUTOCALIBRATION)
-
/*
* Only compile the DDR auto-calibration code for NOR boot and
* not for NAND boot (NAND SPL and NAND U-Boot - NUB)
@@ -1253,4 +1251,3 @@ u32 DQS_autocalibration(void)
return 0;
}
#endif /* !defined(CONFIG_NAND_U_BOOT) !defined(CONFIG_NAND_SPL) */
-#endif /* defined(CONFIG_PPC4xx_DDR_AUTOCALIBRATION) */
diff --git a/arch/powerpc/cpu/ppc4xx/Makefile b/arch/powerpc/cpu/ppc4xx/Makefile
index 129a61e..d97ca20 100644
--- a/arch/powerpc/cpu/ppc4xx/Makefile
+++ b/arch/powerpc/cpu/ppc4xx/Makefile
@@ -34,31 +34,27 @@ SOBJS += kgdb.o
COBJS := 40x_spd_sdram.o
+ifndef CONFIG_NAND_SPL
+ifndef CONFIG_NAND_U_BOOT
COBJS += 44x_spd_ddr.o
-COBJS += 44x_spd_ddr2.o
-ifdef CONFIG_PPC4xx_DDR_AUTOCALIBRATION
-COBJS += 4xx_ibm_ddr2_autocalib.o
endif
+endif
+COBJS-$(CONFIG_SDRAM_PPC4xx_IBM_DDR2) += 44x_spd_ddr2.o
+COBJS-$(CONFIG_PPC4xx_DDR_AUTOCALIBRATION) += 4xx_ibm_ddr2_autocalib.o
COBJS += 4xx_pci.o
COBJS += 4xx_pcie.o
COBJS += bedbug_405.o
-ifdef CONFIG_CMD_CHIP_CONFIG
-COBJS += cmd_chip_config.o
-endif
+COBJS-$(CONFIG_CMD_CHIP_CONFIG)+= cmd_chip_config.o
COBJS += cpu.o
COBJS += cpu_init.o
COBJS += denali_data_eye.o
COBJS += denali_spd_ddr2.o
COBJS += ecc.o
-ifdef CONFIG_CMD_ECCTEST
-COBJS += cmd_ecctest.o
-endif
+COBJS-$(CONFIG_CMD_ECCTEST) += cmd_ecctest.o
COBJS += fdt.o
COBJS += interrupts.o
COBJS += iop480_uart.o
-ifdef CONFIG_CMD_REGINFO
-COBJS += reginfo.o
-endif
+COBJS-$(CONFIG_CMD_REGINFO) += reginfo.o
COBJS += sdram.o
COBJS += speed.o
COBJS += tlb.o
@@ -66,17 +62,16 @@ COBJS += traps.o
COBJS += usb.o
COBJS += usb_ohci.o
COBJS += usbdev.o
+COBJS-$(CONFIG_XILINX_440) += xilinx_irq.o
ifndef CONFIG_XILINX_440
COBJS += 4xx_uart.o
COBJS += gpio.o
COBJS += miiphy.o
COBJS += uic.o
-else
-COBJS += xilinx_irq.o
endif
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
+OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS) $(COBJS-y))
START := $(addprefix $(obj),$(START))
all: $(obj).depend $(START) $(LIB)
--
1.7.3.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 11/24 V2] ppc4xx: Fix build problems of IBM DDR2 NAND booting targets
From: Stefan Roese s...@denx.de
This change is needed to compile the PPC4xx NAND booting targets
equipped with the IBM DDR2 SDRAM controller.
Signed-off-by: Stefan Roese s...@denx.de
Cc: Wolfgang Denk w...@denx.de
---
Stefan, if it's OK with you I will pull this directly.
board/amcc/canyonlands/canyonlands.c | 12
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/board/amcc/canyonlands/canyonlands.c
b/board/amcc/canyonlands/canyonlands.c
index faa3720..80e2739 100644
--- a/board/amcc/canyonlands/canyonlands.c
+++ b/board/amcc/canyonlands/canyonlands.c
@@ -363,18 +363,6 @@ int checkboard(void)
}
#endif /* !defined(CONFIG_ARCHES) */
-#if defined(CONFIG_NAND_U_BOOT)
-/*
- * NAND booting U-Boot version uses a fixed initialization, since the whole
- * I2C SPD DIMM autodetection/calibration doesn't fit into the 4k of boot
- * code.
- */
-phys_size_t initdram(int board_type)
-{
- return CONFIG_SYS_MBYTES_SDRAM 20;
-}
-#endif
-
#if defined(CONFIG_PCI)
int board_pcie_first(void)
{
--
1.7.3.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 12/24 V3] POWERPC: enable --gc-sections and -ffunction-sections -fdata-sections
The switch from archive libraries to partial linking has introduced a number of problems, that are non-trivial to solve. For example, it is no longer possible to include individual object files in the linker script as we did before for example in the case of boards with embedded environment to fill up the gap caused by the need to align the environment on flash erase block boundaries. The best (but unfortunately not easiest) approach to address this problem is to enable -ffunction-sections (and -fdata-sections) so we can again (and even in much finer granularity) place certain code where we want it. When doing this step, it seems only consequent to also add --gc-sections which has the added benefit of reducing the memory footprint of the U-Boot image (both in flash and in RAM). Unfortunately, this requires changes to a lot of linker scripts. Signed-off-by: Wolfgang Denk w...@denx.de Cc: Stefan Roese s...@denx.de Cc: Kim Phillips kim.phill...@freescale.com Cc: Andy Fleming aflem...@gmail.com Cc: Kumar Gala ga...@kernel.crashing.org --- arch/powerpc/config.mk |4 ++-- arch/powerpc/cpu/mpc85xx/config.mk |4 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index 5bc849c..2912604 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -25,9 +25,9 @@ CROSS_COMPILE ?= ppc_8xx- STANDALONE_LOAD_ADDR = 0x4 -PLATFORM_RELFLAGS += -mrelocatable +PLATFORM_RELFLAGS += -mrelocatable -ffunction-sections -fdata-sections PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ -PLATFORM_LDFLAGS += -n +PLATFORM_LDFLAGS += -n --gc-sections ifdef CONFIG_SYS_LDSCRIPT # need to strip off double quotes diff --git a/arch/powerpc/cpu/mpc85xx/config.mk b/arch/powerpc/cpu/mpc85xx/config.mk index 3f3d096..66d1741 100644 --- a/arch/powerpc/cpu/mpc85xx/config.mk +++ b/arch/powerpc/cpu/mpc85xx/config.mk @@ -25,10 +25,6 @@ PLATFORM_RELFLAGS += -fPIC -meabi PLATFORM_CPPFLAGS += -ffixed-r2 -Wa,-me500 -msoft-float -mno-string -# Enable gc-sections to enable generation of smaller images. -PLATFORM_LDFLAGS += --gc-sections -PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections - # -mspe=yes is needed to have -mno-spe accepted by a buggy GCC; # see [PATCH,rs6000] make -mno-spe work as expected on # http://gcc.gnu.org/ml/gcc-patches/2008-04/msg00311.html -- 1.7.3.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 05/24] WINBOND_83C553: enable only on boards that actually use it.
So far, only the BAB7xx board would call the initialise_w83c553f() function for the WINBOND 83C553 chip, even though some other boards (HIDDEN_DRAGON, Sandpoint8240, Sandpoint8245) enabled it in their board configuration. These boards were also missing other config settings needed for that, which resulted in build errors like this: drivers/pci/libpci.o:(.got2+0x84): undefined reference to `ide_bus_offset' Switch arch/powerpc/lib/board.c to call initialise_w83c553f() not on a per-board base, but when a WINBOND_83C553 in enabled in a configuration (like BAB7xx), and disable it in the boards that had this set so far. Signed-off-by: Wolfgang Denk w...@denx.de Cc: Yusdi Santoso yusdi_sant...@adaptec.com Cc: Jim Thompson j...@musenki.com --- arch/powerpc/lib/board.c|2 +- include/configs/HIDDEN_DRAGON.h |2 +- include/configs/Sandpoint8240.h |2 +- include/configs/Sandpoint8245.h |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c index 2e0749d..b21c1d6 100644 --- a/arch/powerpc/lib/board.c +++ b/arch/powerpc/lib/board.c @@ -694,7 +694,7 @@ void board_init_r (gd_t *id, ulong dest_addr) */ pci_init (); #endif -#if defined(CONFIG_BAB7xx) +#if defined(CONFIG_WINBOND_83C553) /* * Initialise the ISA bridge */ diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h index c684cb8..44ae48d 100644 --- a/include/configs/HIDDEN_DRAGON.h +++ b/include/configs/HIDDEN_DRAGON.h @@ -199,7 +199,7 @@ */ -#define CONFIG_WINBOND_83C553 1 /*has a winbond bridge */ +/* #define CONFIG_WINBOND_83C553 1 / *has a winbond bridge */ #define CONFIG_SYS_USE_WINBOND_IDE 0 /*use winbond 83c553 internal IDE ctrlr */ #define CONFIG_SYS_WINBOND_ISA_CFG_ADDR0x80005800 /*pci-isa bridge config addr*/ #define CONFIG_SYS_WINBOND_IDE_CFG_ADDR0x80005900 /*ide config addr */ diff --git a/include/configs/Sandpoint8240.h b/include/configs/Sandpoint8240.h index f984141..74c9ed1 100644 --- a/include/configs/Sandpoint8240.h +++ b/include/configs/Sandpoint8240.h @@ -234,7 +234,7 @@ */ -#define CONFIG_WINBOND_83C553 1 /*has a winbond bridge */ +/* #define CONFIG_WINBOND_83C553 1 / *has a winbond bridge */ #define CONFIG_SYS_USE_WINBOND_IDE 0 /*use winbond 83c553 internal IDE ctrlr */ #define CONFIG_SYS_WINBOND_ISA_CFG_ADDR0x80005800 /*pci-isa bridge config addr*/ #define CONFIG_SYS_WINBOND_IDE_CFG_ADDR0x80005900 /*ide config addr */ diff --git a/include/configs/Sandpoint8245.h b/include/configs/Sandpoint8245.h index b47adcc..92b1256 100644 --- a/include/configs/Sandpoint8245.h +++ b/include/configs/Sandpoint8245.h @@ -202,7 +202,7 @@ */ -#define CONFIG_WINBOND_83C553 1 /*has a winbond bridge */ +/* #define CONFIG_WINBOND_83C553 1 / *has a winbond bridge */ #define CONFIG_SYS_USE_WINBOND_IDE 0 /*use winbond 83c553 internal IDE ctrlr */ #define CONFIG_SYS_WINBOND_ISA_CFG_ADDR0x80005800 /*pci-isa bridge config addr*/ #define CONFIG_SYS_WINBOND_IDE_CFG_ADDR0x80005900 /*ide config addr */ -- 1.7.3.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 15/24 V2] 83xx: Cleanup for partial linking and --gc-sections
Signed-off-by: Wolfgang Denk w...@denx.de
Cc: Kim Phillips kim.phill...@freescale.com
---
Kim, allthough the 83xx boards appear to build fine at first glance,
some (or all?) of the NAND boot images are 4 GB in size. Could you
please have a look what's going wrong there? Thanks.
Kim, if it's OK with you I will pull this directly.
arch/powerpc/cpu/mpc83xx/u-boot.lds | 53 ++
1 files changed, 10 insertions(+), 43 deletions(-)
diff --git a/arch/powerpc/cpu/mpc83xx/u-boot.lds
b/arch/powerpc/cpu/mpc83xx/u-boot.lds
index 0b74a13..81a7ace 100644
--- a/arch/powerpc/cpu/mpc83xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc83xx/u-boot.lds
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2006
+ * (C) Copyright 2006-2010
* Wolfgang Denk, DENX Software Engineering, w...@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -25,41 +25,13 @@ OUTPUT_ARCH(powerpc)
SECTIONS
{
/* Read-only sections, merged into text segment: */
- . = + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym)}
- .dynstr: { *(.dynstr)}
- .rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
- .rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata: { *(.rel.rodata)}
- .rela.rodata : { *(.rela.rodata) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors: { *(.rela.ctors)}
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors: { *(.rela.dtors)}
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init : { *(.init) }
- .plt : { *(.plt) }
.text :
{
-arch/powerpc/cpu/mpc83xx/start.o (.text)
-*(.text)
-*(.got1)
+arch/powerpc/cpu/mpc83xx/start.o (.text*)
+*(.text*)
. = ALIGN(16);
-*(.eh_frame)
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
- .fini : { *(.fini)} =0
- .ctors : { *(.ctors) }
- .dtors : { *(.dtors) }
/* Read-write section, merged into data segment: */
. = (. + 0x0FFF) 0xF000;
@@ -67,23 +39,19 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
-*(.got)
+KEEP(*(.got))
_GOT2_TABLE_ = .;
-*(.got2)
+KEEP(*(.got2))
_FIXUP_TABLE_ = .;
-*(.fixup)
+KEEP(*(.fixup))
}
__got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2;
__fixup_entries = (. - _FIXUP_TABLE_) 2;
.data:
{
-*(.data)
-*(.data1)
-*(.sdata)
-*(.sdata2)
-*(.dynamic)
-CONSTRUCTORS
+*(.data*)
+*(.sdata*)
}
_edata = .;
PROVIDE (edata = .);
@@ -109,9 +77,8 @@ SECTIONS
__bss_start = .;
.bss (NOLOAD) :
{
- *(.sbss) *(.scommon)
- *(.dynbss)
- *(.bss)
+ *(.bss*)
+ *(.sbss*)
*(COMMON)
. = ALIGN(4);
}
--
1.7.3.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 13/24 V2] ppc4xx: Cleanup for partial linking and --gc-sections
This commit adapts 4xx boards for partial linking with --gc-sections.
Signed-off-by: Stefan Roese s...@denx.de
Signed-off-by: Wolfgang Denk w...@denx.de
Cc: Stefan Roese s...@denx.de
Cc: Tirumala Marri tma...@apm.com
Cc: David Updegraff d...@cray.com
Cc: Matthias Fuchs matthias.fu...@esd-electronics.com
Cc: Dirk Eibach eib...@gdsys.de
Cc: Larry Johnson l...@acm.org
Cc: Peter De Schrijver p...@mind.be
Cc: Niklaus Giger niklaus.gi...@netstal.com
Cc: Daniel Poirot dan.poi...@windriver.com
---
Stefan, if it's OK with you I will pull this directly.
arch/powerpc/cpu/ppc4xx/u-boot.lds | 53 -
board/amcc/bamboo/Makefile |6 ++-
board/amcc/bamboo/u-boot-nand.lds | 50
board/amcc/bluestone/Makefile |6 ++-
board/amcc/canyonlands/Makefile|6 ++-
board/amcc/canyonlands/u-boot-nand.lds | 48
board/amcc/sequoia/Makefile|6 ++-
board/amcc/sequoia/u-boot-nand.lds | 48
board/amcc/sequoia/u-boot-ram.lds | 50
board/amirix/ap1000/Makefile |4 +-
board/amirix/ap1000/u-boot.lds | 67 ---
board/cray/L1/L1.c |6 --
board/esd/dasa_sim/u-boot.lds | 57 +--
board/esd/du440/Makefile |6 ++-
board/esd/pmc440/Makefile |6 ++-
board/gdsys/intip/Makefile |6 ++-
board/korat/Makefile |6 ++-
board/lwmon5/Makefile |6 ++-
board/ml2/u-boot.lds | 69
board/netstal/hcu5/Makefile|4 +-
board/sbc405/sbc405.c |7 ---
board/t3corp/Makefile |6 ++-
include/configs/AP1000.h |8 +++
include/configs/CANBT.h|2 +-
include/configs/CPCI2DP.h |2 +-
include/configs/DP405.h|1 +
include/configs/ML2.h |9
include/configs/sc3.h |2 +-
nand_spl/board/amcc/acadia/u-boot.lds |2 +-
nand_spl/board/amcc/bamboo/u-boot.lds |2 +-
nand_spl/board/amcc/canyonlands/u-boot.lds |2 +-
nand_spl/board/amcc/kilauea/u-boot.lds |2 +-
nand_spl/board/amcc/sequoia/u-boot.lds |4 +-
33 files changed, 152 insertions(+), 407 deletions(-)
diff --git a/arch/powerpc/cpu/ppc4xx/u-boot.lds
b/arch/powerpc/cpu/ppc4xx/u-boot.lds
index eca1f9d..dac0e5b 100644
--- a/arch/powerpc/cpu/ppc4xx/u-boot.lds
+++ b/arch/powerpc/cpu/ppc4xx/u-boot.lds
@@ -27,8 +27,7 @@
#endif
OUTPUT_ARCH(powerpc)
-/* Do we need any of these for elf?
- __DYNAMIC = 0;*/
+
PHDRS
{
text PT_LOAD;
@@ -39,43 +38,16 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
. = + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym)}
- .dynstr: { *(.dynstr)}
- .rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
- .rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata: { *(.rel.rodata)}
- .rela.rodata : { *(.rela.rodata) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors: { *(.rela.ctors)}
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors: { *(.rela.dtors)}
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init : { *(.init) }
- .plt : { *(.plt) }
.text :
{
-*(.text)
-*(.got1)
+*(.text*)
} :text
_etext = .;
PROVIDE (etext = .);
.rodata:
{
-*(.eh_frame)
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
} :text
- .fini : { *(.fini)} =0
- .ctors : { *(.ctors) }
- .dtors : { *(.dtors) }
/* Read-write section, merged into data segment: */
. = (. + 0x00FF) 0xFF00;
@@ -83,23 +55,19 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
-*(.got)
+KEEP(*(.got))
_GOT2_TABLE_ = .;
-*(.got2)
+KEEP(*(.got2))
_FIXUP_TABLE_ = .;
-*(.fixup)
+KEEP(*(.fixup))
}
__got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2;
__fixup_entries = (. - _FIXUP_TABLE_) 2;
.data:
{
-*(.data)
-*(.data1)
-*(.sdata)
-*(.sdata2)
-*(.dynamic)
-CONSTRUCTORS
+*(.data*)
+*(.sdata*)
}
_edata = .;
PROVIDE (edata = .);
@@ -138,7 +106,7 @@ SECTIONS
.resetvec RESET_VECTOR_ADDRESS :
{
-
[U-Boot] [PATCH 24/24 V2] 74xx_7xx: Cleanup for partial linking and --gc-sections
Signed-off-by: Wolfgang Denk w...@denx.de
---
arch/powerpc/cpu/74xx_7xx/u-boot.lds | 91 +
board/Marvell/db64360/u-boot.lds | 135 ---
board/Marvell/db64460/u-boot.lds | 135 ---
board/eltec/bab7xx/u-boot.lds | 135 ---
board/eltec/elppc/u-boot.lds | 135 ---
board/esd/cpci750/u-boot.lds | 135 ---
board/evb64260/u-boot.lds | 60 +++---
board/freescale/mpc7448hpc2/u-boot.lds | 133 --
board/pcippc2/u-boot.lds | 138
board/ppmc7xx/u-boot.lds | 132 --
board/prodrive/p3mx/u-boot.lds | 135 ---
drivers/pci/tsi108_pci.c |3 +-
include/configs/EVB64260.h |1 +
13 files changed, 106 insertions(+), 1262 deletions(-)
create mode 100644 arch/powerpc/cpu/74xx_7xx/u-boot.lds
delete mode 100644 board/Marvell/db64360/u-boot.lds
delete mode 100644 board/Marvell/db64460/u-boot.lds
delete mode 100644 board/eltec/bab7xx/u-boot.lds
delete mode 100644 board/eltec/elppc/u-boot.lds
delete mode 100644 board/esd/cpci750/u-boot.lds
delete mode 100644 board/freescale/mpc7448hpc2/u-boot.lds
delete mode 100644 board/pcippc2/u-boot.lds
delete mode 100644 board/ppmc7xx/u-boot.lds
delete mode 100644 board/prodrive/p3mx/u-boot.lds
diff --git a/arch/powerpc/cpu/74xx_7xx/u-boot.lds
b/arch/powerpc/cpu/74xx_7xx/u-boot.lds
new file mode 100644
index 000..771a845
--- /dev/null
+++ b/arch/powerpc/cpu/74xx_7xx/u-boot.lds
@@ -0,0 +1,91 @@
+/*
+ * (C) Copyright 2010 Wolfgang Denk w...@denx.de
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+OUTPUT_ARCH(powerpc)
+
+SECTIONS
+{
+ .text :
+ {
+arch/powerpc/cpu/74xx_7xx/start.o (.text*)
+
+*(.text*)
+ }
+ _etext = .;
+ PROVIDE (etext = .);
+ .rodata:
+ {
+*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
+ }
+
+ /* Read-write section, merged into data segment: */
+ . = (. + 0x00FF) 0xFF00;
+ _erotext = .;
+ PROVIDE (erotext = .);
+ .reloc :
+ {
+KEEP(*(.got))
+_GOT2_TABLE_ = .;
+KEEP(*(.got2))
+_FIXUP_TABLE_ = .;
+KEEP(*(.fixup))
+ }
+ __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2;
+ __fixup_entries = (. - _FIXUP_TABLE_)2;
+
+ .data:
+ {
+*(.data*)
+*(.sdata*)
+ }
+ _edata = .;
+ PROVIDE (edata = .);
+
+ . = .;
+ __u_boot_cmd_start = .;
+ .u_boot_cmd : { *(.u_boot_cmd) }
+ __u_boot_cmd_end = .;
+
+
+ . = .;
+ __start___ex_table = .;
+ __ex_table : { *(__ex_table) }
+ __stop___ex_table = .;
+
+ . = ALIGN(256);
+ __init_begin = .;
+ .text.init : { *(.text.init) }
+ .data.init : { *(.data.init) }
+ . = ALIGN(256);
+ __init_end = .;
+
+ __bss_start = .;
+ .bss (NOLOAD) :
+ {
+ *(.bss*)
+ *(.sbss*)
+ *(COMMON)
+ . = ALIGN(4);
+ }
+ _end = . ;
+ PROVIDE (end = .);
+}
diff --git a/board/Marvell/db64360/u-boot.lds b/board/Marvell/db64360/u-boot.lds
deleted file mode 100644
index 29dcc09..000
--- a/board/Marvell/db64360/u-boot.lds
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * (C) Copyright 2001
- * Josh Huber hu...@mclx.com, Mission Critical Linux, Inc.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-/*
- * u-boot.lds - linker script for U-Boot on
[U-Boot] [PATCH 21/24 V2] 8220: Cleanup for partial linking and --gc-sections
Signed-off-by: Wolfgang Denk w...@denx.de
---
arch/powerpc/cpu/mpc8220/u-boot.lds | 56 +++
1 files changed, 11 insertions(+), 45 deletions(-)
diff --git a/arch/powerpc/cpu/mpc8220/u-boot.lds
b/arch/powerpc/cpu/mpc8220/u-boot.lds
index 31a7a0e..63cbbd7 100644
--- a/arch/powerpc/cpu/mpc8220/u-boot.lds
+++ b/arch/powerpc/cpu/mpc8220/u-boot.lds
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2003-2004
+ * (C) Copyright 2003-2010
* Wolfgang Denk, DENX Software Engineering, w...@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -22,46 +22,17 @@
*/
OUTPUT_ARCH(powerpc)
-/* Do we need any of these for elf?
- __DYNAMIC = 0;*/
+
SECTIONS
{
/* Read-only sections, merged into text segment: */
- . = + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym)}
- .dynstr: { *(.dynstr)}
- .rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
- .rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata: { *(.rel.rodata)}
- .rela.rodata : { *(.rela.rodata) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors: { *(.rela.ctors)}
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors: { *(.rela.dtors)}
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init : { *(.init) }
- .plt : { *(.plt) }
.text :
{
-arch/powerpc/cpu/mpc8220/start.o (.text)
-*(.text)
-*(.got1)
+arch/powerpc/cpu/mpc8220/start.o (.text*)
+*(.text*)
. = ALIGN(16);
-*(.eh_frame)
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
- .fini : { *(.fini)} =0
- .ctors : { *(.ctors) }
- .dtors : { *(.dtors) }
/* Read-write section, merged into data segment: */
. = (. + 0x0FFF) 0xF000;
@@ -69,23 +40,19 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
-*(.got)
+KEEP(*(.got))
_GOT2_TABLE_ = .;
-*(.got2)
+KEEP(*(.got2))
_FIXUP_TABLE_ = .;
-*(.fixup)
+KEEP(*(.fixup))
}
__got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2;
__fixup_entries = (. - _FIXUP_TABLE_) 2;
.data:
{
-*(.data)
-*(.data1)
-*(.sdata)
-*(.sdata2)
-*(.dynamic)
-CONSTRUCTORS
+*(.data*)
+*(.sdata*)
}
_edata = .;
PROVIDE (edata = .);
@@ -111,9 +78,8 @@ SECTIONS
__bss_start = .;
.bss (NOLOAD) :
{
- *(.sbss) *(.scommon)
- *(.dynbss)
- *(.bss)
+ *(.bss*)
+ *(.sbss*)
*(COMMON)
. = ALIGN(4);
}
--
1.7.3.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 20/24 V2] 5xxx: Cleanup for partial linking and --gc-sections
Signed-off-by: Wolfgang Denk w...@denx.de
---
arch/powerpc/cpu/mpc5xxx/Makefile| 27 +++---
arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds | 61 -
arch/powerpc/cpu/mpc5xxx/u-boot.lds | 57
board/manroland/hmi1001/config.mk| 24 -
board/matrix_vision/mvsmr/u-boot.lds | 58 -
include/configs/TQM5200.h|2 +-
include/configs/mcc200.h |2 +-
7 files changed, 56 insertions(+), 175 deletions(-)
delete mode 100644 board/manroland/hmi1001/config.mk
diff --git a/arch/powerpc/cpu/mpc5xxx/Makefile
b/arch/powerpc/cpu/mpc5xxx/Makefile
index ecaeb22..1a088b7 100644
--- a/arch/powerpc/cpu/mpc5xxx/Makefile
+++ b/arch/powerpc/cpu/mpc5xxx/Makefile
@@ -25,14 +25,25 @@ include $(TOPDIR)/config.mk
LIB= $(obj)lib$(CPU).o
-START = start.o
-SOBJS = io.o firmware_sc_task_bestcomm.impl.o
-COBJS = i2c.o traps.o cpu.o cpu_init.o ide.o interrupts.o \
- loadtask.o pci_mpc5200.o serial.o speed.o usb_ohci.o usb.o
-
-SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
-START := $(addprefix $(obj),$(START))
+SSTART = start.o
+CSTART = traps.o
+SOBJS += io.o
+SOBJS += firmware_sc_task_bestcomm.impl.o
+COBJS-y += i2c.o
+COBJS-y += cpu.o
+COBJS-y += cpu_init.o
+COBJS-y += ide.o
+COBJS-y += interrupts.o
+COBJS-y += loadtask.o
+COBJS-y += pci_mpc5200.o
+COBJS-y += serial.o
+COBJS-y += speed.o
+COBJS-$(CONFIG_CMD_USB) += usb_ohci.o
+COBJS-$(CONFIG_CMD_USB) += usb.o
+
+SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS-y))
+START := $(addprefix $(obj),$(SSTART) $(CSTART))
all: $(obj).depend $(START) $(LIB)
diff --git a/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
b/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
index ecffc1b..bbf0f16 100644
--- a/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
+++ b/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
@@ -22,57 +22,25 @@
*/
OUTPUT_ARCH(powerpc)
-/* Do we need any of these for elf?
- __DYNAMIC = 0;*/
+
SECTIONS
{
/* Read-only sections, merged into text segment: */
- . = + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym)}
- .dynstr: { *(.dynstr)}
- .rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
- .rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata: { *(.rel.rodata)}
- .rela.rodata : { *(.rela.rodata) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors: { *(.rela.ctors)}
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors: { *(.rela.dtors)}
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init : { *(.init) }
- .plt : { *(.plt) }
.text :
{
/* WARNING - the following is hand-optimized to fit within */
/* the sector layout of our flash chips!XXX FIXME XXX */
-arch/powerpc/cpu/mpc5xxx/start.o (.text)
-arch/powerpc/cpu/mpc5xxx/traps.o (.text)
-lib/crc32.o (.text)
-arch/powerpc/lib/cache.o (.text)
-arch/powerpc/lib/time.o (.text)
+arch/powerpc/cpu/mpc5xxx/start.o (.text*)
+arch/powerpc/cpu/mpc5xxx/traps.o (.text*)
. = DEFINED(env_offset) ? env_offset : .;
-common/env_embedded.o(.ppcenv)
+common/env_embedded.o (.ppcenv*)
-*(.text)
-*(.got1)
+*(.text*)
. = ALIGN(16);
-*(.eh_frame)
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
- .fini : { *(.fini)} =0
- .ctors : { *(.ctors) }
- .dtors : { *(.dtors) }
/* Read-write section, merged into data segment: */
. = (. + 0x0FFF) 0xF000;
@@ -80,23 +48,19 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
-*(.got)
+KEEP(*(.got))
_GOT2_TABLE_ = .;
-*(.got2)
+KEEP(*(.got2))
_FIXUP_TABLE_ = .;
-*(.fixup)
+KEEP(*(.fixup))
}
__got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2;
__fixup_entries = (. - _FIXUP_TABLE_) 2;
.data:
{
-*(.data)
-*(.data1)
-*(.sdata)
-*(.sdata2)
-*(.dynamic)
-CONSTRUCTORS
+*(.data*)
+*(.sdata*)
}
_edata = .;
PROVIDE (edata = .);
@@ -122,9 +86,8 @@ SECTIONS
__bss_start = .;
.bss (NOLOAD) :
{
- *(.sbss) *(.scommon)
- *(.dynbss)
- *(.bss)
+ *(.bss*)
+ *(.sbss*)
*(COMMON)
. = ALIGN(4);
}
diff --git a/arch/powerpc/cpu/mpc5xxx/u-boot.lds
[U-Boot] [PATCH 19/24 V2] 512x: Cleanup for partial linking and --gc-sections
Signed-off-by: Wolfgang Denk w...@denx.de
Cc: Anatolij Gustschin ag...@denx.de
Cc: Timur Tabi ti...@freescale.com
---
Makefile|5 ++-
arch/powerpc/cpu/mpc512x/Makefile |1 -
arch/powerpc/cpu/mpc512x/u-boot.lds | 53 ++
board/freescale/common/Makefile |4 +-
4 files changed, 16 insertions(+), 47 deletions(-)
diff --git a/Makefile b/Makefile
index b4aae89..28028dc 100644
--- a/Makefile
+++ b/Makefile
@@ -185,6 +185,9 @@ LIBS += lib/lzma/liblzma.o
LIBS += lib/lzo/liblzo.o
LIBS += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
board/$(VENDOR)/common/lib$(VENDOR).o; fi)
+ifdef CONFIG_FSL_DIU_FB
+LIBS += board/freescale/common/libfreescale.o
+endif
LIBS += $(CPUDIR)/lib$(CPU).o
ifdef SOC
LIBS += $(CPUDIR)/$(SOC)/lib$(SOC).o
@@ -260,7 +263,7 @@ ifeq ($(SOC),s5pc2xx)
LIBS += $(CPUDIR)/s5p-common/libs5p-common.o
endif
-LIBS := $(addprefix $(obj),$(LIBS))
+LIBS := $(addprefix $(obj),$(sort $(LIBS)))
.PHONY : $(LIBS) $(TIMESTAMP_FILE) $(VERSION_FILE)
LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).o
diff --git a/arch/powerpc/cpu/mpc512x/Makefile
b/arch/powerpc/cpu/mpc512x/Makefile
index cb1263a..4a4bc0d 100644
--- a/arch/powerpc/cpu/mpc512x/Makefile
+++ b/arch/powerpc/cpu/mpc512x/Makefile
@@ -37,7 +37,6 @@ COBJS-y += iopin.o
COBJS-y += serial.o
COBJS-y += speed.o
COBJS-$(CONFIG_FSL_DIU_FB) += diu.o
-COBJS-$(CONFIG_FSL_DIU_FB) += ../../../../board/freescale/common/fsl_diu_fb.o
COBJS-$(CONFIG_CMD_IDE) += ide.o
COBJS-$(CONFIG_IIM) += iim.o
COBJS-$(CONFIG_PCI) += pci.o
diff --git a/arch/powerpc/cpu/mpc512x/u-boot.lds
b/arch/powerpc/cpu/mpc512x/u-boot.lds
index c716799..361e714 100644
--- a/arch/powerpc/cpu/mpc512x/u-boot.lds
+++ b/arch/powerpc/cpu/mpc512x/u-boot.lds
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2007 DENX Software Engineering.
+ * (C) Copyright 2007-2010 DENX Software Engineering.
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -23,42 +23,13 @@
OUTPUT_ARCH(powerpc)
SECTIONS
{
- /* Read-only sections, merged into text segment: */
- . = + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym)}
- .dynstr: { *(.dynstr)}
- .rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
- .rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata: { *(.rel.rodata)}
- .rela.rodata : { *(.rela.rodata) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors: { *(.rela.ctors)}
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors: { *(.rela.dtors)}
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init : { *(.init) }
- .plt : { *(.plt) }
.text :
{
-arch/powerpc/cpu/mpc512x/start.o (.text)
-*(.text)
-*(.got1)
+arch/powerpc/cpu/mpc512x/start.o (.text*)
+*(.text*)
. = ALIGN(16);
-*(.eh_frame)
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
- .fini : { *(.fini)} =0
- .ctors : { *(.ctors) }
- .dtors : { *(.dtors) }
/* Read-write section, merged into data segment: */
. = (. + 0x0FFF) 0xF000;
@@ -66,10 +37,11 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
-*(.got)
+KEEP(*(.got))
_GOT2_TABLE_ = .;
-*(.got2)
+KEEP(*(.got2))
_FIXUP_TABLE_ = .;
+KEEP(*(.fixup))
*(.fixup)
}
__got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2;
@@ -77,12 +49,8 @@ SECTIONS
.data:
{
-*(.data)
-*(.data1)
-*(.sdata)
-*(.sdata2)
-*(.dynamic)
-CONSTRUCTORS
+*(.data*)
+*(.sdata*)
}
_edata = .;
PROVIDE (edata = .);
@@ -108,9 +76,8 @@ SECTIONS
__bss_start = .;
.bss (NOLOAD) :
{
- *(.sbss) *(.scommon)
- *(.dynbss)
- *(.bss)
+ *(.bss*)
+ *(.sbss*)
*(COMMON)
. = ALIGN(4);
}
diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index 703a347..905dd7a 100644
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -24,10 +24,10 @@
include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
-$(shell mkdir -p $(obj)board/$(VENDOR)/common)
+$(shell mkdir -p $(obj)board/freescale/common)
endif
-LIB= $(obj)lib$(VENDOR).o
+LIB= $(obj)libfreescale.o
COBJS-$(CONFIG_FSL_CADMUS) += cadmus.o
COBJS-$(CONFIG_FSL_VIA)+= cds_via.o
--
1.7.3.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 16/24 V2] 86xx: Cleanup for partial linking and --gc-sections
Signed-off-by: Wolfgang Denk w...@denx.de
Cc: Kumar Gala ga...@kernel.crashing.org
---
Kumar, if it's OK with you I will pull this directly.
arch/powerpc/cpu/mpc86xx/Makefile |6 ++--
arch/powerpc/cpu/mpc86xx/u-boot.lds | 36 ++
2 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/arch/powerpc/cpu/mpc86xx/Makefile
b/arch/powerpc/cpu/mpc86xx/Makefile
index 9b2db1b..5b7d80a 100644
--- a/arch/powerpc/cpu/mpc86xx/Makefile
+++ b/arch/powerpc/cpu/mpc86xx/Makefile
@@ -28,7 +28,8 @@ include $(TOPDIR)/config.mk
LIB= $(obj)lib$(CPU).o
-START = start.o
+SSTART = start.o
+CSTART = traps.o
SOBJS-y += cache.o
SOBJS-$(CONFIG_MP) += release.o
@@ -42,11 +43,10 @@ COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
COBJS-y+= interrupts.o
COBJS-$(CONFIG_MP) += mp.o
COBJS-y+= speed.o
-COBJS-y+= traps.o
SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
-START := $(addprefix $(obj),$(START))
+START := $(addprefix $(obj),$(SSTART) $(CSTART))
all: $(obj).depend $(START) $(LIB)
diff --git a/arch/powerpc/cpu/mpc86xx/u-boot.lds
b/arch/powerpc/cpu/mpc86xx/u-boot.lds
index 4bfcb90..49a4c78 100644
--- a/arch/powerpc/cpu/mpc86xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc86xx/u-boot.lds
@@ -26,40 +26,10 @@ SECTIONS
{
/* Read-only sections, merged into text segment: */
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym)}
- .dynstr: { *(.dynstr)}
- .rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
- .rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata: { *(.rel.rodata)}
- .rela.rodata : { *(.rela.rodata) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors: { *(.rela.ctors)}
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors: { *(.rela.dtors)}
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init : { *(.init) }
- .plt : { *(.plt) }
.text :
{
-arch/powerpc/cpu/mpc86xx/start.o (.text)
-arch/powerpc/cpu/mpc86xx/traps.o (.text)
-arch/powerpc/cpu/mpc86xx/interrupts.o (.text)
-arch/powerpc/cpu/mpc86xx/cpu_init.o (.text)
-arch/powerpc/cpu/mpc86xx/cpu.o (.text)
-arch/powerpc/cpu/mpc86xx/speed.o (.text)
-common/dlmalloc.o (.text)
-lib/crc32.o (.text)
-arch/powerpc/lib/extable.o (.text)
-lib/zlib.o (.text)
+arch/powerpc/cpu/mpc86xx/start.o (.text*)
+arch/powerpc/cpu/mpc86xx/traps.o (.text*)
*(.text*)
}
_etext = .;
@@ -112,8 +82,8 @@ SECTIONS
__bss_start = .;
.bss (NOLOAD) :
{
- *(.sbss*)
*(.bss*)
+ *(.sbss*)
*(COMMON)
. = ALIGN(4);
}
--
1.7.3.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 22/24 V2] 824x: Cleanup for partial linking and --gc-sections
Signed-off-by: Wolfgang Denk w...@denx.de
---
arch/powerpc/cpu/mpc824x/u-boot.lds | 53 ---
board/cpc45/pd67290.c |4 +-
board/mousse/u-boot.lds | 56 +++
board/mvblue/u-boot.lds | 99 +++
board/sandpoint/u-boot.lds | 97 ++
drivers/net/Makefile| 10 +++-
include/configs/MVBLUE.h|1 +
include/configs/Sandpoint8240.h |1 +
include/configs/Sandpoint8245.h |1 +
9 files changed, 227 insertions(+), 95 deletions(-)
create mode 100644 board/mvblue/u-boot.lds
create mode 100644 board/sandpoint/u-boot.lds
diff --git a/arch/powerpc/cpu/mpc824x/u-boot.lds
b/arch/powerpc/cpu/mpc824x/u-boot.lds
index d1fcd7c..e7f2837 100644
--- a/arch/powerpc/cpu/mpc824x/u-boot.lds
+++ b/arch/powerpc/cpu/mpc824x/u-boot.lds
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2001-2007
+ * (C) Copyright 2001-2010
* Wolfgang Denk, DENX Software Engineering, w...@denx.de.
*
* See file CREDITS for list of people who contributed to this
@@ -27,41 +27,13 @@ OUTPUT_ARCH(powerpc)
SECTIONS
{
/* Read-only sections, merged into text segment: */
- . = + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym)}
- .dynstr: { *(.dynstr)}
- .rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
- .rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata: { *(.rel.rodata)}
- .rela.rodata : { *(.rela.rodata) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors: { *(.rela.ctors)}
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors: { *(.rela.dtors)}
- .rel.bss : { *(.rel.bss) }
- .rela.bss : { *(.rela.bss) }
- .rel.plt : { *(.rel.plt) }
- .rela.plt : { *(.rela.plt) }
- .init : { *(.init) }
- .plt : { *(.plt) }
.text :
{
-arch/powerpc/cpu/mpc824x/start.o (.text)
-*(.text)
-*(.got1)
+arch/powerpc/cpu/mpc824x/start.o (.text*)
+*(.text*)
. = ALIGN(16);
-*(.eh_frame)
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
- .fini : { *(.fini)} =0
- .ctors : { *(.ctors) }
- .dtors : { *(.dtors) }
/* Read-write section, merged into data segment: */
. = (. + 0x0FFF) 0xF000;
@@ -69,23 +41,19 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
-*(.got)
+KEEP(*(.got))
_GOT2_TABLE_ = .;
-*(.got2)
+KEEP(*(.got2))
_FIXUP_TABLE_ = .;
-*(.fixup)
+KEEP(*(.fixup))
}
__got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2;
__fixup_entries = (. - _FIXUP_TABLE_) 2;
.data:
{
-*(.data)
-*(.data1)
-*(.sdata)
-*(.sdata2)
-*(.dynamic)
-CONSTRUCTORS
+*(.data*)
+*(.sdata*)
}
_edata = .;
PROVIDE (edata = .);
@@ -111,9 +79,8 @@ SECTIONS
__bss_start = .;
.bss (NOLOAD) :
{
- *(.sbss) *(.scommon)
- *(.dynbss)
- *(.bss)
+ *(.bss*)
+ *(.sbss*)
*(COMMON)
. = ALIGN(4);
}
diff --git a/board/cpc45/pd67290.c b/board/cpc45/pd67290.c
index 12c9c74..0d8ef23 100644
--- a/board/cpc45/pd67290.c
+++ b/board/cpc45/pd67290.c
@@ -639,7 +639,7 @@ static int i365_set_io_map (socket_info_t * s, struct
pccard_io_map *io)
#defineHOST_TO_PCI(addr) ((addr) - 0xfe00)
#definePCI_TO_HOST(addr) ((addr) + 0xfe00)
-int i82365_init (void)
+static int i82365_init (void)
{
u_int val;
int i;
@@ -719,7 +719,7 @@ int i82365_init (void)
return 0;
}
-void i82365_exit (void)
+static void i82365_exit (void)
{
io.map = 0;
io.flags = 0;
diff --git a/board/mousse/u-boot.lds b/board/mousse/u-boot.lds
index 0116dde..4cfb95c 100644
--- a/board/mousse/u-boot.lds
+++ b/board/mousse/u-boot.lds
@@ -27,46 +27,13 @@ OUTPUT_ARCH(powerpc)
SECTIONS
{
/* Read-only sections, merged into text segment: */
- . = + SIZEOF_HEADERS;
- .interp : { *(.interp) }
- .hash : { *(.hash) }
- .dynsym: { *(.dynsym)}
- .dynstr: { *(.dynstr)}
- .rel.text : { *(.rel.text) }
- .rela.text : { *(.rela.text) }
- .rel.data : { *(.rel.data) }
- .rela.data : { *(.rela.data) }
- .rel.rodata: { *(.rel.rodata)}
- .rela.rodata : { *(.rela.rodata) }
- .rel.got : { *(.rel.got) }
- .rela.got : { *(.rela.got) }
- .rel.ctors : { *(.rel.ctors) }
- .rela.ctors: { *(.rela.ctors)}
- .rel.dtors : { *(.rel.dtors) }
- .rela.dtors: { *(.rela.dtors)}
Re: [U-Boot] [PATCH 08/24 V2] cpu/ppc4xx/Makefile: build only needed object files
Hi Wolfgang, On Thursday 25 November 2010 17:00:28 Wolfgang Denk wrote: Signed-off-by: Wolfgang Denk w...@denx.de Cc: Stefan Roese s...@denx.de --- Stefan, if it's OK with you I will pull this directly. Yes, please do: Acked-by: Stefan Roese s...@denx.de Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 10/24 V2] PPChameleonEVB and CATcenter need a custom linker script
Hi Wolfgang, On Thursday 25 November 2010 17:00:30 Wolfgang Denk wrote: These boards use an embedded environment, which is not supported by the generic arch/powerpc/cpu/ppc4xx/u-boot.lds script. The breakage was introduced by commit 2cd95a2 ppc4xx: Remove board specific linker scripts from most PPC4xx boards Signed-off-by: Wolfgang Denk w...@denx.de Cc: Stefan Roese s...@denx.de Cc: Andrea Marson andrea.mar...@dave-tech.it --- Stefan, if it's OK with you I will pull this directly. Yes, please do: Acked-by: Stefan Roese s...@denx.de Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 11/24 V2] ppc4xx: Fix build problems of IBM DDR2 NAND booting targets
Hi Wolfgang, On Thursday 25 November 2010 17:00:31 Wolfgang Denk wrote: From: Stefan Roese s...@denx.de This change is needed to compile the PPC4xx NAND booting targets equipped with the IBM DDR2 SDRAM controller. Signed-off-by: Stefan Roese s...@denx.de Cc: Wolfgang Denk w...@denx.de --- Stefan, if it's OK with you I will pull this directly. Yes, please do. And for the other ppc4xx specific ones too. For all patches in this series: Acked-by: Stefan Roese s...@denx.de Thanks. Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 09/24 V2] arch/powerpc/*/config.mk: makeCONFIG_SYS_LDSCRIPT settings work
On Thu, 2010-11-25 at 09:00 -0700, Wolfgang Denk wrote: As we try to get rid of board specific config.mk files we must provide a way for board specific settings of the LDSCRIPT variable (path to the linker script) where needed. We now implement the following hierarchy: - Highest priority has a #define CONFIG_SYS_LDCONFIG in the board config file. - If CONFIG_SYS_LDCONFIG is not set, and the system is booting from NAND (CONFIG_NAND_U_BOOT is set), then a board specific linker script board/$(BOARDDIR)/u-boot-nand.lds gets use. u-boot-nand.lds is not in board/$(BOARDDIR) for 85xx at least, it is in $(SRCTREE)/$(CPUDIR)/ - If we are not booting from NAND, we test if a processor specific linker script arch/powerpc/cpu/$(CPU)/u-boot.lds exists; if so we use that. should we use $(CPUDIR) instead of arch/powerpc/cpu/$(CPU)? Haiying ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] OMAP3: add CM-T35 board
Mike Rapoport wrote, on 11/23/2010 01:29 AM: minor comments follow: [...] diff --git a/board/cm_t35/cm_t35.h b/board/cm_t35/cm_t35.h new file mode 100644 index 000..514017d --- /dev/null +++ b/board/cm_t35/cm_t35.h [..] /*DSS_DATA22*/\ + MUX_VAL(CP(DSS_DATA23), (IDIS | PTD | DIS | M0)) /*DSS_DATA23*/\ Are you using bootlogo in CM-t35 u-boot? + MUX_VAL(CP(SYS_CLKOUT1),(IEN | PTD | DIS | M0)) /*CLKOUT1*/\ + MUX_VAL(CP(SYS_CLKOUT2),(IDIS | PTD | DIS | M4)) /*green LED*/\ might be better to state which GPIO than green led :) + MUX_VAL(CP(JTAG_nTRST), (IEN | PTD | DIS | M0)) /*JTAG_nTRST*/\ + MUX_VAL(CP(JTAG_TCK), (IEN | PTD | DIS | M0)) /*JTAG_TCK*/\ + MUX_VAL(CP(JTAG_TMS), (IEN | PTD | DIS | M0)) /*JTAG_TMS*/\ + MUX_VAL(CP(JTAG_TDI), (IEN | PTD | DIS | M0)) /*JTAG_TDI*/\ + MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0)) /*sdrc_cke0*/\ + MUX_VAL(CP(SDRC_CKE1), (IDIS | PTD | DIS | M7)) /*sdrc_cke1*/\ this tiny set probably should go along with sdrc to reflect proper functional set I guess. Mike can you respond to these comments from Nishanth? I'd really like to add this 1 year old patch u-boot. --Sandeep ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 09/24 V2] arch/powerpc/*/config.mk: makeCONFIG_SYS_LDSCRIPT settings work
Dear Haiying Wang, In message 1290702018.2007.4.ca...@haiying-laptop you wrote: - If CONFIG_SYS_LDCONFIG is not set, and the system is booting from NAND (CONFIG_NAND_U_BOOT is set), then a board specific linker script board/$(BOARDDIR)/u-boot-nand.lds gets use. u-boot-nand.lds is not in board/$(BOARDDIR) for 85xx at least, it is in $(SRCTREE)/$(CPUDIR)/ This is not correct - situation before applying my patches: - find * -name u-boot-nand.lds arch/powerpc/cpu/mpc85xx/u-boot-nand.lds board/amcc/acadia/u-boot-nand.lds board/amcc/bamboo/u-boot-nand.lds board/amcc/canyonlands/u-boot-nand.lds board/amcc/kilauea/u-boot-nand.lds board/amcc/sequoia/u-boot-nand.lds board/esd/pmc440/u-boot-nand.lds board/samsung/smdk6400/u-boot-nand.lds - If we are not booting from NAND, we test if a processor specific linker script arch/powerpc/cpu/$(CPU)/u-boot.lds exists; if so we use that. should we use $(CPUDIR) instead of arch/powerpc/cpu/$(CPU)? I'm not sure if CPUDIR is defined at that time. Did you try it out? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de The world is no nursery. - Sigmund Freud ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 09/24 V2] arch/powerpc/*/config.mk: makeCONFIG_SYS_LDSCRIPT settings work
Dear Haiying Wang, In message 1290702018.2007.4.ca...@haiying-laptop you wrote: On Thu, 2010-11-25 at 09:00 -0700, Wolfgang Denk wrote: As we try to get rid of board specific config.mk files we must provide a way for board specific settings of the LDSCRIPT variable (path to the linker script) where needed. We now implement the following hierarchy: - Highest priority has a #define CONFIG_SYS_LDCONFIG in the board config file. - If CONFIG_SYS_LDCONFIG is not set, and the system is booting from NAND (CONFIG_NAND_U_BOOT is set), then a board specific linker script board/$(BOARDDIR)/u-boot-nand.lds gets use. u-boot-nand.lds is not in board/$(BOARDDIR) for 85xx at least, it is in $(SRCTREE)/$(CPUDIR)/ What is incorrect is the description - it does not match the latest code: we don't test CONFIG_NAND_U_BOOT but CONFIG_NAND_SPL. I will fix this when applying. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Good morning. This is the telephone company. Due to repairs, we're giving you advance notice that your service will be cut off indefi- nitely at ten o'clock. That's two minutes from now. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 15/24 V2] 83xx: Cleanup for partial linking and --gc-sections
Dear Kim, In message 1290700844-31427-16-git-send-email...@denx.de I wrote: Signed-off-by: Wolfgang Denk w...@denx.de Cc: Kim Phillips kim.phill...@freescale.com --- Kim, allthough the 83xx boards appear to build fine at first glance, some (or all?) of the NAND boot images are 4 GB in size. Could you please have a look what's going wrong there? Thanks. I just noticed Scott's patch that addresses this issue: http://patchwork.ozlabs.org/patch/72962/ This fixes the issue. How shall we handle this? Will you send a pull request any time soon, or shall I pull directly? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de It is easier to port a shell than a shell script. - Larry Wall ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] 83xx: Fix NAND_SPL link address
Dear Scott Wood, In message 20101124232840.ga17...@udp111988uds.am.freescale.net you wrote: Apply the same fix for 83xx as was done for 85xx in commit 96196a1f7546904563994d2d041804a816d7c139. Without this, NAND SPLs are built with the text base intended for the main image, resulting in a broken, very large u-boot-nand.bin. The block of defines for NAND boot is moved closer to where CONFIG_SYS_TEXT_BASE is defined. We can't directly use CONFIG_SYS_NAND_U_BOOT_DST in the definition of CONFIG_SYS_TEXT_BASE because autoconf.mk will include the literal text CONFIG_SYS_NAND_U_BOOT_DST, but at least keep them close and point out that they're supposed to be the same. Signed-off-by: Scott Wood scottw...@freescale.com --- Compile tested on MPC8315ERDB and SIMPC8313 Boot tested on MPC8313ERDB boards.cfg|6 ++-- include/configs/MPC8313ERDB.h | 27 +--- include/configs/MPC8315ERDB.h | 23 +++- include/configs/SIMPC8313.h | 23 - nand_spl/board/freescale/mpc8313erdb/Makefile |4 +- nand_spl/board/freescale/mpc8315erdb/Makefile |4 +- nand_spl/board/sheldon/simpc8313/Makefile |4 +- 7 files changed, 58 insertions(+), 33 deletions(-) Tested building and image sizes. Tested-by: Wolfgang Denk w...@denx.de Acked-by: Wolfgang Denk w...@denx.de Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de In accord with UNIX philosophy, Perl gives you enough rope to hang yourself. - L. Wall R. L. Schwartz, _Programming Perl_ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 09/24 V2] arch/powerpc/*/config.mk:makeCONFIG_SYS_LDSCRIPT settings work
On Thu, 2010-11-25 at 10:19 -0700, Wolfgang Denk wrote: Dear Haiying Wang, In message 1290702018.2007.4.ca...@haiying-laptop you wrote: - If CONFIG_SYS_LDCONFIG is not set, and the system is booting from NAND (CONFIG_NAND_U_BOOT is set), then a board specific linker script board/$(BOARDDIR)/u-boot-nand.lds gets use. u-boot-nand.lds is not in board/$(BOARDDIR) for 85xx at least, it is in $(SRCTREE)/$(CPUDIR)/ This is not correct - situation before applying my patches: - find * -name u-boot-nand.lds arch/powerpc/cpu/mpc85xx/u-boot-nand.lds so your patch for arch/powerpc/config.mk will not get u-boot-nand.lds for mpc85xx boards, only for the boards below. Then 85xx boards still need to get the lds from board/$(BOARDIR)/config.mk. Is that what you want? board/amcc/acadia/u-boot-nand.lds board/amcc/bamboo/u-boot-nand.lds board/amcc/canyonlands/u-boot-nand.lds board/amcc/kilauea/u-boot-nand.lds board/amcc/sequoia/u-boot-nand.lds board/esd/pmc440/u-boot-nand.lds board/samsung/smdk6400/u-boot-nand.lds - If we are not booting from NAND, we test if a processor specific linker script arch/powerpc/cpu/$(CPU)/u-boot.lds exists; if so we use that. should we use $(CPUDIR) instead of arch/powerpc/cpu/$(CPU)? I'm not sure if CPUDIR is defined at that time. Did you try it out? CPUDIR is defined in config.mk, I tried it for 85xx/p1 boards and it worked. Haiying ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 15/24 V2] 83xx: Cleanup for partial linking and--gc-sections
On Thu, 2010-11-25 at 09:00 -0700, Wolfgang Denk wrote: Signed-off-by: Wolfgang Denk w...@denx.de Cc: Kim Phillips kim.phill...@freescale.com --- Kim, allthough the 83xx boards appear to build fine at first glance, some (or all?) of the NAND boot images are 4 GB in size. Could you please have a look what's going wrong there? Thanks. Kim, if it's OK with you I will pull this directly. arch/powerpc/cpu/mpc83xx/u-boot.lds | 53 ++ 1 files changed, 10 insertions(+), 43 deletions(-) I think the u-boot.lds in nand_spl/board/freescale/mpc83xx/ needs to have the fix as well. Haiying ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 09/24 V2] arch/powerpc/*/config.mk:makeCONFIG_SYS_LDSCRIPT settings work
Dear Haiying Wang, In message 1290708988.2007.13.ca...@haiying-laptop you wrote: u-boot-nand.lds is not in board/$(BOARDDIR) for 85xx at least, it is in $(SRCTREE)/$(CPUDIR)/ This is not correct - situation before applying my patches: - find * -name u-boot-nand.lds arch/powerpc/cpu/mpc85xx/u-boot-nand.lds Oops, sorry. I missed that one, even though I was looking for it :-( so your patch for arch/powerpc/config.mk will not get u-boot-nand.lds for mpc85xx boards, only for the boards below. Then 85xx boards still need to get the lds from board/$(BOARDIR)/config.mk. Is that what you want? No, not really. But actually I was just cleaning up probems where ran into them, not trying to perform a more general cleanup [*]. The situation is that the relevant 85xx boards appeare to have their own config.mk files which explicitly set LDSCRIPT to the value they need (which is indeed different from the default that gets set up ib arch/powerpc/config.mk: arch/powerpc/config.mk: LDSCRIPT := $(SRCTREE)/$(CONFIG_BOARDDIR)/u-boot-nand.lds board/freescale/mpc8536ds/config.mk: LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds board/freescale/mpc8569mds/config.mk: LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds board/freescale/p1_p2_rdb/config.mk: LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds So it seems my patches do not have any impact on the building of 85xx systems. Or am I missing something? CPUDIR is defined in config.mk, I tried it for 85xx/p1 boards and it worked. OK, I'll remember this for the next optimization. [*] There is more that can be done for ontimization: actually many of the PPC u-boot.lds files are (except for white space, indentation and tiny irrelevant details) identical. I intend to use a single, common linker script for all these cases, which will allow to remove dozens of more or less identical files. But I want to have a stable code base first. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Go to Heaven for the climate, Hell for the company.- Mark Twain ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 15/24 V2] 83xx: Cleanup for partial linking and--gc-sections
Dear Haiying Wang, In message 1290709405.2007.16.ca...@haiying-laptop you wrote: I think the u-boot.lds in nand_spl/board/freescale/mpc83xx/ needs to have the fix as well. Which fix do you mean? I see two such files: nand_spl/board/freescale/mpc8313erdb/u-boot.lds nand_spl/board/freescale/mpc8315erdb/u-boot.lds They are identical and look sane to me. OK, we can drop the *(.eh_frame) line, but it doesn't hurt either. Which exact fix do you have in mind? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Open the pod bay doors, HAL.- Dave Bowman, 2001 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 15/24 V2] 83xx: Cleanup for partial linking and--gc-sections
On Thu, 2010-11-25 at 11:32 -0700, Wolfgang Denk wrote: Dear Haiying Wang, In message 1290709405.2007.16.ca...@haiying-laptop you wrote: I think the u-boot.lds in nand_spl/board/freescale/mpc83xx/ needs to have the fix as well. Which fix do you mean? I see two such files: nand_spl/board/freescale/mpc8313erdb/u-boot.lds nand_spl/board/freescale/mpc8315erdb/u-boot.lds They are identical and look sane to me. OK, we can drop the *(.eh_frame) line, but it doesn't hurt either. Which exact fix do you have in mind? I mean: - *(.got2) + KEEP(*(.got2)) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 09/24 V2] arch/powerpc/*/config.mk:makeCONFIG_SYS_LDSCRIPT settings work
On Thu, 2010-11-25 at 11:28 -0700, Wolfgang Denk wrote: Dear Haiying Wang, In message 1290708988.2007.13.ca...@haiying-laptop you wrote: u-boot-nand.lds is not in board/$(BOARDDIR) for 85xx at least, it is in $(SRCTREE)/$(CPUDIR)/ This is not correct - situation before applying my patches: - find * -name u-boot-nand.lds arch/powerpc/cpu/mpc85xx/u-boot-nand.lds Oops, sorry. I missed that one, even though I was looking for it :-( so your patch for arch/powerpc/config.mk will not get u-boot-nand.lds for mpc85xx boards, only for the boards below. Then 85xx boards still need to get the lds from board/$(BOARDIR)/config.mk. Is that what you want? No, not really. But actually I was just cleaning up probems where ran into them, not trying to perform a more general cleanup [*]. The situation is that the relevant 85xx boards appeare to have their own config.mk files which explicitly set LDSCRIPT to the value they need (which is indeed different from the default that gets set up ib arch/powerpc/config.mk: arch/powerpc/config.mk: LDSCRIPT := $(SRCTREE)/$(CONFIG_BOARDDIR)/u-boot-nand.lds board/freescale/mpc8536ds/config.mk: LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds board/freescale/mpc8569mds/config.mk: LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds board/freescale/p1_p2_rdb/config.mk: LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds So it seems my patches do not have any impact on the building of 85xx systems. Or am I missing something? No, your patch doesn't have impact on them. I just wonder if you wanted to apply your patch for 85xx board.:) Haiying ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] RFC: missing patch review for LL TEMAC driver to u-boot
Am Donnerstag, 25. November 2010, um 10:25:02 schrieb Michal Simek: Stephan Linz wrote: Am Mittwoch, 17. November 2010, um 13:15:24 schrieb Stephan Linz: Hi Michal, --snip-- Hi Michal, thanks again. I've to fixed some bugs. The corresponding patches I will send in a separeted e-mail. Watch the mailing list / your inbox. Now most things are working (see dump below) but sometimes I get more or less LEN messages (ex.: len bad 156 208). Can you confirm this? I think it is not a problem with the driver, or not? IMHO it has connection with your lan traffic. U-boot expect specific packet len but got different one. I think so too without to explore the whole network traffic. I will repeat my tests in another network (as fast as possible). Thanks for your efforts. Haven't had time to look your changes but hopefully I'll look at it hopefully soon. It's ok. Stephan Michal U-Boot-mONStR dhcp 0x2090 /ml605/linuximage.ub Xilinx_LL_TEMAC: Xilinx XPS LocalLink Tri-Mode Ether MAC #0 at 0x88F0. Looking for phy ... OK Waiting for link ... OK 100BASE-T/FD BOOTP broadcast 1 DHCP client bound to address 192.168.10.175 Using Xilinx_LL_TEMAC device TFTP from server 192.168.10.10; our IP address is 192.168.10.175 Filename '/ml605/linuximage.ub'. Load address: 0x2090 Loading: # # # # # # # # ## done Bytes transferred = 7837764 (779844 hex) -- Viele Grüße, Stephan Linz __ OpenDCC: http://www.li-pro.net/opendcc.phtml PC/M: http://www.li-pro.net/pcm.phtml CDK4AVR: http://cdk4avr.sourceforge.net/ CDK4NIOS: http://cdk4nios.sourceforge.net/ CDK4MSP: http://cdk4msp.sourceforge.net/ CPM4L: http://download.opensuse.org/repositories/home:/rexut:/CPM4L ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] arm: add ELF relocation support to rest of cpus
bulk addition of ELF relocation support to ARM cpus arm946es, arm720t,arm920t, arm925t, arm_intcm, ixp, lh7a40x, s3c44b0, and sa1100. Signed-off-by: Albert Aribaud albert.arib...@free.fr --- arch/arm/cpu/arm720t/start.S | 119 + arch/arm/cpu/arm720t/u-boot.lds | 39 +++ arch/arm/cpu/arm920t/start.S | 125 ++- arch/arm/cpu/arm920t/u-boot.lds | 38 +++ arch/arm/cpu/arm925t/start.S | 127 +++- arch/arm/cpu/arm925t/u-boot.lds | 38 +++ arch/arm/cpu/arm946es/start.S | 123 ++- arch/arm/cpu/arm946es/u-boot.lds | 38 +++ arch/arm/cpu/arm_intcm/start.S| 127 +++ arch/arm/cpu/arm_intcm/u-boot.lds | 38 +++ arch/arm/cpu/ixp/start.S | 118 + arch/arm/cpu/ixp/u-boot.lds | 38 +++ arch/arm/cpu/lh7a40x/start.S | 119 + arch/arm/cpu/lh7a40x/u-boot.lds | 38 +++ arch/arm/cpu/s3c44b0/start.S | 131 + arch/arm/cpu/s3c44b0/u-boot.lds | 38 +++ arch/arm/cpu/sa1100/start.S | 119 + arch/arm/cpu/sa1100/u-boot.lds| 38 +++ 18 files changed, 785 insertions(+), 666 deletions(-) diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index 8cd267b..46050da 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -81,14 +81,17 @@ _TEXT_BASE: /* * These are defined in the board-specific linker script. + * Subtracting _start from them lets the linker put their + * relative position in the executable instead of leaving + * them null. */ -.globl _bss_start -_bss_start: - .word __bss_start +.globl _bss_start_ofs +_bss_start_ofs: + .word __bss_start - _start -.globl _bss_end -_bss_end: - .word _end +.globl _bss_end_ofs +_bss_end_ofs: + .word _end - _start #ifdef CONFIG_USE_IRQ /* IRQ stack memory (calculated at run-time) */ @@ -107,30 +110,6 @@ FIQ_STACK_START: IRQ_STACK_START_IN: .word 0x0badc0de -.globl _datarel_start -_datarel_start: - .word __datarel_start - -.globl _datarelrolocal_start -_datarelrolocal_start: - .word __datarelrolocal_start - -.globl _datarellocal_start -_datarellocal_start: - .word __datarellocal_start - -.globl _datarelro_start -_datarelro_start: - .word __datarelro_start - -.globl _got_start -_got_start: - .word __got_start - -.globl _got_end -_got_end: - .word __got_end - /* * the actual reset code */ @@ -184,9 +163,8 @@ stack_setup: adr r0, _start ldr r2, _TEXT_BASE - ldr r3, _bss_start - sub r2, r3, r2 /* r2 - size of armboot*/ - add r2, r0, r2 /* r2 - source end address */ + ldr r3, _bss_start_ofs + add r2, r0, r3 /* r2 - source end address */ cmp r0, r6 beq clear_bss @@ -197,35 +175,53 @@ copy_loop: blo copy_loop #ifndef CONFIG_PRELOADER - /* fix got entries */ - ldr r1, _TEXT_BASE /* Text base */ - mov r0, r7 /* reloc addr */ - ldr r2, _got_start /* addr in Flash */ - ldr r3, _got_end/* addr in Flash */ - sub r3, r3, r1 - add r3, r3, r0 - sub r2, r2, r1 - add r2, r2, r0 - + /* +* fix .rel.dyn relocations +*/ + ldr r0, _TEXT_BASE /* r0 - Text base */ + sub r9, r7, r0 /* r9 - relocation offset */ + ldr r10, _dynsym_start_ofs /* r10 - sym table ofs */ + add r10, r10, r0/* r10 - sym table in FLASH */ + ldr r2, _rel_dyn_start_ofs /* r2 - rel dyn start ofs */ + add r2, r2, r0 /* r2 - rel dyn start in FLASH */ + ldr r3, _rel_dyn_end_ofs/* r3 - rel dyn end ofs */ + add r3, r3, r0 /* r3 - rel dyn end in FLASH */ fixloop: - ldr r4, [r2] - sub r4, r4, r1 - add r4, r4, r0 - str r4, [r2] - add r2, r2, #4 + ldr r0, [r2]/* r0 - location to fix up, IN FLASH! */ + add r0, r0, r9 /* r0 - location to fix up in RAM */ + ldr r1, [r2, #4] + and r8, r1, #0xff + cmp r8, #23 /* relative fixup? */ + beq fixrel + cmp r8, #2 /* absolute fixup? */ + beq fixabs + /* ignore unknown type of fixup */ + b fixnext +fixabs: + /* absolute fix: set location to (offset) symbol value */ + mov r1, r1, LSR #4 /* r1 - symbol index in .dynsym */ + add
[U-Boot] [PATCH] usb_ether: register usb ethernet gadget at each eth init
Since the ether may not be the only one usb gadget would be used in the uboot, it is neccessary to do the register each time the eth begin to work to make usb gadget driver less confussed when we want to use two different usb gadget at the same time. Usb gadget driver could simple ignore the register operation, if it find the driver has been registered already. Signed-off-by: Lei Wen lei...@marvell.com --- drivers/usb/gadget/ether.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 5a18e03..d57b2ad 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -1788,6 +1788,8 @@ static int usb_eth_init(struct eth_device *netdev, bd_t *bd) error(received NULL ptr); goto fail; } + if (usb_gadget_register_driver(eth_driver) 0) + goto fail; dev-network_started = 0; -- 1.7.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
