diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-25 10:39:58 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-25 10:39:58 +0200 |
commit | ed1d98d801dfb6384d0f2fff45ce1ebf884944ca (patch) | |
tree | 5a9487c67b75606d3a723b7acb9eda8da200c871 /board/altera/nios2-generic/Makefile | |
parent | 754466ac95e92ebf40e25c6af6f13ab9b4d7c87b (diff) | |
parent | ba9b42c81b0734d53edfbb1fe4a6ded7de78c5ab (diff) | |
download | talos-obmc-uboot-ed1d98d801dfb6384d0f2fff45ce1ebf884944ca.tar.gz talos-obmc-uboot-ed1d98d801dfb6384d0f2fff45ce1ebf884944ca.zip |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/altera/nios2-generic/Makefile')
-rw-r--r-- | board/altera/nios2-generic/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/board/altera/nios2-generic/Makefile b/board/altera/nios2-generic/Makefile index 84690fe04d..aa362b3609 100644 --- a/board/altera/nios2-generic/Makefile +++ b/board/altera/nios2-generic/Makefile @@ -9,5 +9,4 @@ obj-y := nios2-generic.o obj-$(CONFIG_CMD_IDE) += ../common/cfide.o obj-$(CONFIG_EPLED) += ../common/epled.o -obj-$(CONFIG_SEVENSEG) += ../common/sevenseg.o obj-y += text_base.o |