[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2469-g2628476

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  262847657e1c959dde9d3b9b1b79e2dd26cce353 (commit)
      from  36255af9661282c6376c6cb0bf1439a5928dee23 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 262847657e1c959dde9d3b9b1b79e2dd26cce353
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Aug 9 16:59:07 2011 +0200

    [BUILDROOT] Get rid of buildroot/target/device/armadeus/[apf*|pps]/Makefile.in

-----------------------------------------------------------------------

Summary of changes:
 buildroot/target/device/armadeus/Makefile.in       |    9 ++++++---
 buildroot/target/device/armadeus/apf27/Makefile.in |    1 -
 buildroot/target/device/armadeus/apf51/Makefile.in |    1 -
 .../target/device/armadeus/apf9328/Makefile.in     |    1 -
 buildroot/target/device/armadeus/pps/Makefile.in   |    1 -
 5 files changed, 6 insertions(+), 7 deletions(-)
 delete mode 100644 buildroot/target/device/armadeus/apf27/Makefile.in
 delete mode 100644 buildroot/target/device/armadeus/apf51/Makefile.in
 delete mode 100644 buildroot/target/device/armadeus/apf9328/Makefile.in
 delete mode 100644 buildroot/target/device/armadeus/pps/Makefile.in

diff --git a/buildroot/target/device/armadeus/Makefile.in b/buildroot/target/device/armadeus/Makefile.in
index 9f02e9e..6726432 100644
--- a/buildroot/target/device/armadeus/Makefile.in
+++ b/buildroot/target/device/armadeus/Makefile.in
@@ -7,10 +7,13 @@ BOARD_PATH:=$(call qstrip,$(BR2_BOARD_PATH))
 LINUX26_KERNEL_NAME:=$(BOARD_NAME)-linux.bin
 
 include target/device/armadeus/u-boot/u-boot.mk
-#include target/device/armadeus/rootfs/Makefile.in
 
+# U-Boot variables overloading:
 U_BOOT_TARGET_BIN:=$(BOARD_NAME)-u-boot.bin
-include target/device/armadeus/$(BOARD_NAME)/Makefile.in
-
+ifeq ($(BOARD_NAME),apf9328)
+U_BOOT_BIN=u-boot.bin
+else
+U_BOOT_BIN=u-boot-nand.bin
 endif
 
+endif
diff --git a/buildroot/target/device/armadeus/apf27/Makefile.in b/buildroot/target/device/armadeus/apf27/Makefile.in
deleted file mode 100644
index 96f4f8a..0000000
--- a/buildroot/target/device/armadeus/apf27/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-U_BOOT_BIN=u-boot-nand.bin
diff --git a/buildroot/target/device/armadeus/apf51/Makefile.in b/buildroot/target/device/armadeus/apf51/Makefile.in
deleted file mode 100644
index 96f4f8a..0000000
--- a/buildroot/target/device/armadeus/apf51/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-U_BOOT_BIN=u-boot-nand.bin
diff --git a/buildroot/target/device/armadeus/apf9328/Makefile.in b/buildroot/target/device/armadeus/apf9328/Makefile.in
deleted file mode 100644
index bd307be..0000000
--- a/buildroot/target/device/armadeus/apf9328/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-U_BOOT_BIN=u-boot.bin
diff --git a/buildroot/target/device/armadeus/pps/Makefile.in b/buildroot/target/device/armadeus/pps/Makefile.in
deleted file mode 100644
index 96f4f8a..0000000
--- a/buildroot/target/device/armadeus/pps/Makefile.in
+++ /dev/null
@@ -1 +0,0 @@
-U_BOOT_BIN=u-boot-nand.bin


hooks/post-receive
-- 
armadeus