diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-09 10:47:05 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-09 11:50:14 +0200 |
| commit | d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 (patch) | |
| tree | d71aae6d706d1f3b01da5f944e247abe308feea0 /nand_spl/board/freescale/mpc8569mds/Makefile | |
| parent | 7904b70885f3c589c239f6ac978f299a6744557f (diff) | |
| parent | 173d294b94cfec10063a5be40934d6d8fb7981ce (diff) | |
| download | talos-obmc-uboot-d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19.tar.gz talos-obmc-uboot-d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19.zip | |
Merge branch 'u-boot/master'
Conflicts:
drivers/net/Makefile
(trivial merge)
Diffstat (limited to 'nand_spl/board/freescale/mpc8569mds/Makefile')
| -rw-r--r-- | nand_spl/board/freescale/mpc8569mds/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile index c639b126fd..9f338024ea 100644 --- a/nand_spl/board/freescale/mpc8569mds/Makefile +++ b/nand_spl/board/freescale/mpc8569mds/Makefile @@ -78,11 +78,7 @@ $(obj)/resetvec.S: @rm -f $@ ln -s $(srctree)/$(CPUDIR)/resetvec.S $@ -$(obj)/fixed_ivor.S: - @rm -f $@ - ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $@ - -$(obj)/start.S: $(obj)/fixed_ivor.S +$(obj)/start.S: @rm -f $@ ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/start.S $@ |
