diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-12 15:23:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 15:23:20 +0200 |
| commit | b476b032562aae5a09985f7e22232a5ee7042746 (patch) | |
| tree | 0be91a99d935a06e1c51f9c7fc544ee4935762bb /board/xilinx | |
| parent | 06c4ab50f5ccfb55ea2dd324aa28b2b06102e416 (diff) | |
| parent | b18410e508a12ba0a177dfc2a386857c806fa96d (diff) | |
| download | u-boot-imx-b476b032562aae5a09985f7e22232a5ee7042746.zip u-boot-imx-b476b032562aae5a09985f7e22232a5ee7042746.tar.gz u-boot-imx-b476b032562aae5a09985f7e22232a5ee7042746.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'board/xilinx')
| -rw-r--r-- | board/xilinx/ml507/.gitignore | 1 | ||||
| -rw-r--r-- | board/xilinx/ppc440-generic/.gitignore | 1 | ||||
| -rw-r--r-- | board/xilinx/ppc440-generic/config.mk | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/board/xilinx/ml507/.gitignore b/board/xilinx/ml507/.gitignore new file mode 100644 index 0000000..f6418a0 --- /dev/null +++ b/board/xilinx/ml507/.gitignore @@ -0,0 +1 @@ +/config.tmp diff --git a/board/xilinx/ppc440-generic/.gitignore b/board/xilinx/ppc440-generic/.gitignore new file mode 100644 index 0000000..f6418a0 --- /dev/null +++ b/board/xilinx/ppc440-generic/.gitignore @@ -0,0 +1 @@ +/config.tmp diff --git a/board/xilinx/ppc440-generic/config.mk b/board/xilinx/ppc440-generic/config.mk index 8d220da..6d76755 100644 --- a/board/xilinx/ppc440-generic/config.mk +++ b/board/xilinx/ppc440-generic/config.mk @@ -22,4 +22,4 @@ # MA 02111-1307 USA # -sinclude $(obj)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp |