Changes in Makefile

1ad6364eeb4f578e423081d1748e8a3fdf1ab01d - Merge branch 'master' of git://git.denx.de/u-boot-arm

Wed, 05 Mar 2014 11:51:26 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

3e11350255d9c5d4bd03c2a65769da84c05d3294 - Merge branch 'u-boot/master' into 'u-boot-arm/master'

Thu, 20 Feb 2014 12:16:05 +0000

Merge branch 'u-boot/master' into 'u-boot-arm/master'Conflicts: Makefile drivers/net/npe/MakefileThese two conflicts arise from commit 0b2d3f20("ARM: NET: Remove the IXP NPE ethernet driver") and areresolved by deleting the drivers/net/npe/Makefile fileand removing the CONFIG_IXP4XX_NPE line from Makefile. List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

6825a95b0ba72c4e5667d02d8b31986e2e9abd5a - kbuild: use Linux Kernel build scripts

Tue, 04 Feb 2014 08:24:28 +0000

kbuild: use Linux Kernel build scriptsNow we are ready to switch over to real Kbuild.This commit disables temporary scripts: scripts/{Makefile.build.tmp, Makefile.host.tmp}and enables real Kbuild scripts: scripts/{Makefile.build,Makefile.host,Makefile.lib}.This switch is triggered by the line in scripts/Kbuild.include -build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build.tmp obj +build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build objWe need to adjust some build scripts for U-Boot.But smaller amount of modification is preferable.Additionally, we need to fix compiler flags which arelocally added or removed.In Kbuild, it is not allowed to change CFLAGS locally.Instead, ccflags-y, asflags-y, cppflags-y,CFLAGS_$(basetarget).o, CFLAGS_REMOVE_$(basetarget).oare prepared for that purpose.Signed-off-by: Masahiro Yamada Tested-by: Gerhard Sittig List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

64bd89e43778b488763f67fbb6bf79fc973e2892 - m68k: convert makefiles to Kbuild style

Mon, 21 Oct 2013 02:53:35 +0000

m68k: convert makefiles to Kbuild styleSigned-off-by: Masahiro Yamada Cc: Jason Jin List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

326ea986ac150acdc7656d57fca647db80b50158 - Merge git://git.denx.de/u-boot-arm

Wed, 31 Jul 2013 09:30:38 +0000

Merge git://git.denx.de/u-boot-armConflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.hSigned-off-by: Stefano Babic List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

8b485ba12b0defa0c4ed3559789250238f8331a8 - Merge branch 'u-boot/master' into u-boot-arm/master

Thu, 25 Jul 2013 15:57:46 +0000

Merge branch 'u-boot/master' into u-boot-arm/master List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

1a4596601fd395f3afb8f82f3f840c5e00bdd57a - Add GPL-2.0+ SPDX-License-Identifier to source files

Mon, 08 Jul 2013 07:37:19 +0000

Add GPL-2.0+ SPDX-License-Identifier to source filesSigned-off-by: Wolfgang Denk [trini: Fixup common/cmd_io.c]Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

f82c087e60fe1c59ace1c6f016eb89c5d3c3ae13 - Merge branch 'master' of git://git.denx.de/u-boot-coldfire

Fri, 21 Oct 2011 21:36:40 +0000

Merge branch 'master' of git://git.denx.de/u-boot-coldfire* 'master' of git://git.denx.de/u-boot-coldfire: ColdFire: Clean Makefile _config rules ColdFire: Move boards with simple _config rules to boards.cfg ColdFire: Fix compilation with CONFIG_SYS_DRAMSZ1 defined ColdFire: Merge differentiated linking files into a sigle one by board ColdFire: Add $(obj) before cpu lib to correct build ColdFire: Cleanup lds files for multiple defined symbols List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

aa2bd9b015a2a4f1117f1c124064a06fbca039ab - ColdFire: Add $(obj) before cpu lib to correct build

Fri, 14 Oct 2011 04:38:02 +0000

ColdFire: Add $(obj) before cpu lib to correct buildMissing $(obj) prevented the build of ColdFire boards in a directorythan sourcesSigned-off-by: Stany MARCEL List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

6d8962e814c15807dd6ac5757904be2a02d187b8 - Switch from archive libraries to partial linking

Fri, 05 Nov 2010 14:48:07 +0000

Switch from archive libraries to partial linkingBefore this commit, weak symbols were not overridden by non-weak symbolsfound in archive libraries when linking with recent versions ofbinutils. As stated in the System V ABI, "the link editor does notextract archive members to resolve undefined weak symbols".This commit changes all Makefiles to use partial linking (ld -r) insteadof creating library archives, which forces all symbols to participate inlinking, allowing non-weak symbols to override weak symbols as intended.This approach is also used by Linux, from which the gmake functioncmd_link_o_target (defined in config.mk and used in all Makefiles) isinspired.The name of each former library archive is preserved except forextensions which change from ".a" to ".o". This commit updatesreferences accordingly where needed, in particular in some linkerscripts.This commit reveals board configurations that exclude some features butinclude source files that depend these disabled features in the build,resulting in undefined symbols. Known such cases include:- disabling CMD_NET but not CMD_NFS;- enabling CONFIG_OF_LIBFDT but not CONFIG_QE.Signed-off-by: Sebastien Carlier List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

83653121d7382fccfe329cb732f77f116341ef1d - Merge branch 'master' of git://git.denx.de/u-boot-arm

Mon, 19 Apr 2010 01:26:18 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armConflicts: cpu/arm1176/cpu.c cpu/arm1176/start.S cpu/arm_cortexa8/s5pc1xx/Makefile cpu/arm_cortexa8/s5pc1xx/clock.c drivers/serial/serial_s5p.c include/asm-arm/arch-s5pc1xx/clk.h include/asm-arm/arch-s5pc1xx/gpio.h include/asm-arm/arch-s5pc1xx/uart.hSigned-off-by: Minkyu Kang List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile

a4145534851bf74619cb373a942613a74547bb82 - m68k: Move cpu/$CPU to arch/m68k/cpu/$CPU

Tue, 13 Apr 2010 03:28:12 +0000

m68k: Move cpu/$CPU to arch/m68k/cpu/$CPUSigned-off-by: Peter Tyser List of files: /rk3399_rockchip-uboot/arch/m68k/cpu/mcf5445x/Makefile