[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2511-g4da0a98

[Gwenhael <gwe...@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  4da0a98e8ae6a0834a0837a1113143b29639cfd4 (commit)
       via  ccb0d3348eb677ad7c9a7e4341fd6f49eaadf9f1 (commit)
      from  7bc375fa10496ca9e4f5fdeae8ce344cc647f1a0 (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 4da0a98e8ae6a0834a0837a1113143b29639cfd4
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Mon Sep 26 14:39:31 2011 +0200

    [LINUX][BOARD_DESIGNS] prober for sploader: suppress useless command in Makefile and variables

commit ccb0d3348eb677ad7c9a7e4341fd6f49eaadf9f1
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date:   Mon Sep 26 14:37:35 2011 +0200

    [LINUX][VIRTUAL_COMPONENTS] sploader source cleanup

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

Summary of changes:
 .../fpga/board_designs/spvision_loader/Makefile    |   22 --------------------
 .../spvision_loader/sploader_prober.c              |    8 +++---
 .../fpga/virtual_components/sploader/sp-loader.c   |    1 -
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/target/linux/modules/fpga/board_designs/spvision_loader/Makefile b/target/linux/modules/fpga/board_designs/spvision_loader/Makefile
index 918a1ed..2a3b1cf 100644
--- a/target/linux/modules/fpga/board_designs/spvision_loader/Makefile
+++ b/target/linux/modules/fpga/board_designs/spvision_loader/Makefile
@@ -2,26 +2,4 @@
 # Makefile for the Armadeus FPGA loader driver
 #
 
-ifneq ($(KERNELRELEASE),)
-
 obj-$(CONFIG_ARMADEUS_FPGA_BOARD_DESIGNS_SPVISION_PROBER)	+= sploader_prober.o
-
-# Part executed when called from standard make in this directory:
-# (preferably use Makefile in parent directory)
-
-else
-ARMADEUS_BASE_DIR=../../../../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-KDIR := $(ARMADEUS_KERNEL_DIR)
-PWD	 := $(shell pwd)
-CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
-
-default:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-
-clean:
-	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
-	rm -f modules.order Module.markers
- 
-endif
-
diff --git a/target/linux/modules/fpga/board_designs/spvision_loader/sploader_prober.c b/target/linux/modules/fpga/board_designs/spvision_loader/sploader_prober.c
index cf5a94e..7b88c36 100644
--- a/target/linux/modules/fpga/board_designs/spvision_loader/sploader_prober.c
+++ b/target/linux/modules/fpga/board_designs/spvision_loader/sploader_prober.c
@@ -1,9 +1,10 @@
 /*
  ***********************************************************************
  *
- * (c) Copyright 2008	Armadeus project
+ * (c) Copyright 2011	Armadeus project
  * Fabien Marteau <fab...@ar...>
- * Specific led driver for generic led driver
+ * Gwenhael Goavec-Merou <gwe...@ar...>
+ * loader driver for generic sploader driver
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,12 +44,11 @@ static Xilinx_desc plat_sploader0_data = {
 	.iface = slave_parallel,
 	.size = (11875104l / 8),    //XILINX_XC6SLX45_SIZE,
 	.fpga_offset = 0xD6000000l,
-	.ip_id = 0, // l'id du composant == idnum
 	.cookie = 1,
 	.name		= "SP_VISION_CONFIGURE00",
 	.num		= 0,
 	.idnum		= 1,
-	.idoffset	=  0x0 * (16 /8) // pos de l'id dans le composant
+	.idoffset	=  0x0 * (16 /8)
 };
 
 
diff --git a/target/linux/modules/fpga/virtual_components/sploader/sp-loader.c b/target/linux/modules/fpga/virtual_components/sploader/sp-loader.c
index cf2231a..4f1a0ac 100644
--- a/target/linux/modules/fpga/virtual_components/sploader/sp-loader.c
+++ b/target/linux/modules/fpga/virtual_components/sploader/sp-loader.c
@@ -257,7 +257,6 @@ static int armadeus_sploader_probe(struct platform_device *pdev)
 	Xilinx_desc *pdata = pdev->dev.platform_data;
 	int ret = 0;
 	int result;
-	u16 data;
 	struct device *dev = &pdev->dev;
 	Xilinx_desc *platform_info;
 	struct resource *mem_res;


hooks/post-receive
-- 
armadeus