From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pavel Machek Date: Wed, 3 Oct 2012 15:11:45 +0200 Subject: [U-Boot] [PATCHv5] ARM: Add Altera SOCFPGA Cyclone5 In-Reply-To: <20121003125635.GA25959@elf.ucw.cz> References: <1349217924-3792-1-git-send-email-dinguyen@altera.com> <20121002223310.GH30129@bill-the-cat> <20121003135900.302c0944@lilith> <20121003125635.GA25959@elf.ucw.cz> Message-ID: <20121003131145.GA4720@elf.ucw.cz> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi! > But this one is a mystery. Offending lines are: > > #include > > DECLARE_GLOBAL_DATA_PTR; > > [line 26:] void show_boot_progress(int progress) > { > debug("Boot reached stage %d\n", progress); > } > > Do we need direct include asm/global_data.h for > DECLARE_GLOBAL_DATA_PTR? Is something funny going on with debug()? Is > show_boot_progress() a macro in your build? Would it be enough to > check out current u-boot-arm to reproduce? show_boot_progress() became a macro (for SPL build only, in the tree I can see). We can add an ifdef, but perhaps we should just delete the function... Signed-off-by: Pavel Machek Thanks, Pavel diff --git a/arch/arm/include/asm/arch-socfpga/spl.h b/arch/arm/include/asm/arch-socfpga/spl.h index c2014c5..efd0c06 100644 --- a/arch/arm/include/asm/arch-socfpga/spl.h +++ b/arch/arm/include/asm/arch-socfpga/spl.h @@ -19,7 +19,7 @@ #define _SOCFPGA_SPL_H_ /* Symbols from linker script */ -extern void __malloc_start, __malloc_end, __stack_start; +extern char __malloc_start, __malloc_end, __stack_start; #define BOOT_DEVICE_RAM 1 diff --git a/board/altera/socfpga_cyclone5/socfpga_cyclone5.c b/board/altera/socfpga_cyclone5/socfpga_cyclone5.c index 858ab3c..7725be1 100644 --- a/board/altera/socfpga_cyclone5/socfpga_cyclone5.c +++ b/board/altera/socfpga_cyclone5/socfpga_cyclone5.c @@ -23,11 +23,6 @@ DECLARE_GLOBAL_DATA_PTR; -void show_boot_progress(int progress) -{ - debug("Boot reached stage %d\n", progress); -} - /* * Print CPU information */ -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html