diff mbox

[U-Boot] dts/Makefile: Check for empty $(LDSCRIPT)

Message ID 1342097912-8652-1-git-send-email-hkronsto@frequentis.com
State Accepted
Commit a4ff471970e8f749dc16643ee7e354a3fcfa2ad7
Headers show

Commit Message

Horst Kronstorfer July 12, 2012, 12:58 p.m. UTC
Make sure that $(LDSCRIPT) is not empty before calling process_lds
with 'cat $(LDSCRIPT)' else cat will block waiting for input from
stdin.

Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
---
 dts/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Wolfgang Denk Aug. 10, 2012, 9:46 p.m. UTC | #1
Dear Horst Kronstorfer,

In message <1342097912-8652-1-git-send-email-hkronsto@frequentis.com> you wrote:
> Make sure that $(LDSCRIPT) is not empty before calling process_lds
> with 'cat $(LDSCRIPT)' else cat will block waiting for input from
> stdin.
> 
> Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
> ---
>  dts/Makefile | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
Kumar Gala Aug. 14, 2012, 1:42 p.m. UTC | #2
On Aug 10, 2012, at 4:46 PM, Wolfgang Denk wrote:

> Dear Horst Kronstorfer,
> 
> In message <1342097912-8652-1-git-send-email-hkronsto@frequentis.com> you wrote:
>> Make sure that $(LDSCRIPT) is not empty before calling process_lds
>> with 'cat $(LDSCRIPT)' else cat will block waiting for input from
>> stdin.
>> 
>> Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
>> ---
>> dts/Makefile | 5 +++--
>> 1 file changed, 3 insertions(+), 2 deletions(-)
> 
> Applied, thanks.
> 
> Best regards,
> 
> Wolfgang Denk
> 

This patch is breaking builds on (P4080DS_config) on ppc:

arch/powerpc/cpu/mpc85xx/libmpc85xx.o: In function `ft_cpu_setup':
/local/home/galak/git/u-boot/arch/powerpc/cpu/mpc85xx/fdt.c:614: undefined reference to `get_board_sys_clk'
arch/powerpc/cpu/mpc85xx/libmpc85xx.o: In function `get_sys_info':
/local/home/galak/git/u-boot/arch/powerpc/cpu/mpc85xx/speed.c:77: undefined reference to `get_board_sys_clk'
arch/powerpc/cpu/mpc85xx/libmpc85xx.o:(.got2+0x344): undefined reference to `tlb_table'
arch/powerpc/cpu/mpc85xx/libmpc85xx.o:(.got2+0x348): undefined reference to `num_tlb_entries'
arch/powerpc/lib/libpowerpc.o: In function `board_init_r':
/local/home/galak/git/u-boot/arch/powerpc/lib/board.c:850: undefined reference to `mac_read_from_eeprom'
common/libcommon.o:(.u_boot_cmd+0x370): undefined reference to `do_mac'
drivers/misc/libmisc.o:(.got2+0x14): undefined reference to `law_table'
drivers/misc/libmisc.o:(.got2+0x18): undefined reference to `num_law_entries'
drivers/pci/libpci.o: In function `pci_init':
/local/home/galak/git/u-boot/drivers/pci/pci.c:731: undefined reference to `pci_init_board'
board/freescale/corenet_ds/libcorenet_ds.o: In function `ft_board_setup':
/local/home/galak/git/u-boot/board/freescale/corenet_ds/corenet_ds.c:231: undefined reference to `pci_of_setup'
board/freescale/corenet_ds/libcorenet_ds.o: In function `board_ft_fman_fixup_port':
/local/home/galak/git/u-boot/board/freescale/corenet_ds/eth_p4080.c:230: undefined reference to `fdt_set_phy_handle'
/local/home/galak/git/u-boot/board/freescale/corenet_ds/eth_p4080.c:238: undefined reference to `fdt_set_phy_handle'
make: *** [u-boot] Error 1
[

- k
Kumar Gala Aug. 14, 2012, 9:33 p.m. UTC | #3
On Aug 14, 2012, at 8:42 AM, Kumar Gala wrote:

> 
> On Aug 10, 2012, at 4:46 PM, Wolfgang Denk wrote:
> 
>> Dear Horst Kronstorfer,
>> 
>> In message <1342097912-8652-1-git-send-email-hkronsto@frequentis.com> you wrote:
>>> Make sure that $(LDSCRIPT) is not empty before calling process_lds
>>> with 'cat $(LDSCRIPT)' else cat will block waiting for input from
>>> stdin.
>>> 
>>> Signed-off-by: Horst Kronstorfer <hkronsto@frequentis.com>
>>> ---
>>> dts/Makefile | 5 +++--
>>> 1 file changed, 3 insertions(+), 2 deletions(-)
>> 
>> Applied, thanks.
>> 
>> Best regards,
>> 
>> Wolfgang Denk
>> 
> 
> This patch is breaking builds on (P4080DS_config) on ppc:
> 
> arch/powerpc/cpu/mpc85xx/libmpc85xx.o: In function `ft_cpu_setup':
> /local/home/galak/git/u-boot/arch/powerpc/cpu/mpc85xx/fdt.c:614: undefined reference to `get_board_sys_clk'
> arch/powerpc/cpu/mpc85xx/libmpc85xx.o: In function `get_sys_info':
> /local/home/galak/git/u-boot/arch/powerpc/cpu/mpc85xx/speed.c:77: undefined reference to `get_board_sys_clk'
> arch/powerpc/cpu/mpc85xx/libmpc85xx.o:(.got2+0x344): undefined reference to `tlb_table'
> arch/powerpc/cpu/mpc85xx/libmpc85xx.o:(.got2+0x348): undefined reference to `num_tlb_entries'
> arch/powerpc/lib/libpowerpc.o: In function `board_init_r':
> /local/home/galak/git/u-boot/arch/powerpc/lib/board.c:850: undefined reference to `mac_read_from_eeprom'
> common/libcommon.o:(.u_boot_cmd+0x370): undefined reference to `do_mac'
> drivers/misc/libmisc.o:(.got2+0x14): undefined reference to `law_table'
> drivers/misc/libmisc.o:(.got2+0x18): undefined reference to `num_law_entries'
> drivers/pci/libpci.o: In function `pci_init':
> /local/home/galak/git/u-boot/drivers/pci/pci.c:731: undefined reference to `pci_init_board'
> board/freescale/corenet_ds/libcorenet_ds.o: In function `ft_board_setup':
> /local/home/galak/git/u-boot/board/freescale/corenet_ds/corenet_ds.c:231: undefined reference to `pci_of_setup'
> board/freescale/corenet_ds/libcorenet_ds.o: In function `board_ft_fman_fixup_port':
> /local/home/galak/git/u-boot/board/freescale/corenet_ds/eth_p4080.c:230: undefined reference to `fdt_set_phy_handle'
> /local/home/galak/git/u-boot/board/freescale/corenet_ds/eth_p4080.c:238: undefined reference to `fdt_set_phy_handle'
> make: *** [u-boot] Error 1
> [
> 
> - k

This is fixed by:

http://patchwork.ozlabs.org/patch/177235/

- k
diff mbox

Patch

diff --git a/dts/Makefile b/dts/Makefile
index 402dfe1..9a54ca5 100644
--- a/dts/Makefile
+++ b/dts/Makefile
@@ -66,8 +66,9 @@  $(obj)dt.o: $(DT_BIN)
 	# We look in the LDSCRIPT first.
 	# Then try the linker which should give us the answer.
 	# Then check it worked.
-	oformat=`$(call process_lds,cat $(LDSCRIPT),FORMAT)` ;\
-	oarch=`$(call process_lds,cat $(LDSCRIPT),ARCH)` ;\
+	[ -n "$(LDSCRIPT)" ] && \
+		oformat=`$(call process_lds,cat $(LDSCRIPT),FORMAT)` && \
+		oarch=`$(call process_lds,cat $(LDSCRIPT),ARCH)` ;\
 	\
 	[ -z $${oformat} ] && \
 		oformat=`$(call process_lds,$(GET_LDS),FORMAT)` ;\