[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-370-g4436ec3
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-370-g4436ec3
|
From: jorasse <jo...@us...> - 2013-08-09 16:49:48
|
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 4436ec3daf9863334b4e9a3f66737a1ec530907d (commit)
from ee6dedf7bc30460b58eccb930ad62721a09a138a (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 4436ec3daf9863334b4e9a3f66737a1ec530907d
Author: Eric Jarrige <eri...@ar...>
Date: Fri Aug 9 18:59:01 2013 +0200
[UBOOT] apf27: simplify FPGA management and improve download reliability
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2013.04.h | 3 +--
.../target/device/armadeus/u-boot-env-2013.04.txt | 2 +-
...-add-support-for-the-armadeus-APF27-board.patch | 16 +---------------
...pf27-Add-FPGA-support-for-the-apf27-board.patch | 6 +++---
4 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
index d0dce93..888bb5d 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2013.04.h
@@ -23,7 +23,6 @@
* Enable the call to miscellaneous platform dependent initialization.
*/
#define CONFIG_SYS_NO_FLASH /* to be define before <config_cmd_default.h> */
-#define CONFIG_MISC_INIT_R
#define CONFIG_BOARD_EARLY_INIT_F
#ifdef CONFIG_SPL_BUILD
#define CONFIG_SKIP_LOWLEVEL_INIT
@@ -305,7 +304,7 @@
#define CONFIG_FPGA_COUNT 1
#define CONFIG_FPGA_XILINX
#define CONFIG_FPGA_SPARTAN3
-#define CONFIG_SYS_FPGA_WAIT 20000 /* 20 ms */
+#define CONFIG_SYS_FPGA_WAIT 1000 /* 1 s */
#define CONFIG_SYS_FPGA_PROG_FEEDBACK
#define CONFIG_SYS_FPGA_CHECK_CTRLC
#define CONFIG_SYS_FPGA_CHECK_ERROR
diff --git a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
index 0290499..d34227c 100644
--- a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
@@ -4,7 +4,7 @@ download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin
flash_firmware=nand erase.part firmware;if nand write.trimffs ${fileaddr} ${firmware_addr} ${filesize};then echo Flashing of Firmware succeed;else echo Flashing of Firmware failed;fi
update_firmware=run download_firmware flash_firmware
load_firmware=nand read ${loadaddr} firmware && fpga loadb 0 ${loadaddr} ${firmware_size} || fpga load 0 ${loadaddr} ${firmware_size}; if test $? -eq 0; then echo Firmware successfully loaded; else echo Loading firmware failed!; fi;
-checknload_firmware=if test -n ${firmware_autoload}; then if test -n ${had_ctrlc}; then echo Firmware download stopped; else run load_firmware; fi; else exit; fi;
+checknload_firmware=if test -n ${firmware_autoload}; then run load_firmware; fi;
# DTB
download_dtb=tftpboot ${loadaddr} ${cpu_name}-${board_name}.dtb
diff --git a/patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch b/patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch
index e39cb12..fd41d81 100644
--- a/patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch
+++ b/patches/u-boot/2013.04/302-apf27-add-support-for-the-armadeus-APF27-board.patch
@@ -96,7 +96,7 @@ new file mode 100644
index 0000000..fce3325
--- /dev/null
+++ b/board/armadeus/apf27/apf27.c
-@@ -0,0 +1,329 @@
+@@ -0,0 +1,315 @@
+/*
+ * Copyright (C) 2007 Sascha Hauer, Pengutronix
+ * Copyright (C) 2008-2012 Eric Jarrige <eri...@ar...>
@@ -403,20 +403,6 @@ index 0000000..fce3325
+ gd->ram_size = gd->bd->bi_dram[0].size + gd->bd->bi_dram[1].size;
+}
+
-+/*
-+ * Miscellaneous initialisation
-+ */
-+int misc_init_r(void)
-+{
-+ /* create or delete environment variable if CTRL-C is pressed or not.*/
-+ if (ctrlc())
-+ setenv ("had_ctrlc", "1");
-+ else
-+ setenv ("had_ctrlc", "");
-+
-+ return 0;
-+}
-+
+int checkboard(void)
+{
+ printf("Board: Armadeus APF27 revision %d\n", get_board_rev());
diff --git a/patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch b/patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
index 0948b61..d7fa176 100644
--- a/patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
+++ b/patches/u-boot/2013.04/304-apf27-Add-FPGA-support-for-the-apf27-board.patch
@@ -38,16 +38,16 @@ index fce3325..951a5e3 100644
DECLARE_GLOBAL_DATA_PTR;
@@ -321,6 +322,10 @@ int misc_init_r(void)
- else
- setenv ("had_ctrlc", "");
+ apf27_gpio_init();
+ apf27_devices_init();
+#if defined(CONFIG_FPGA)
+ APF27_init_fpga();
+#endif
+
+
return 0;
}
-
diff --git a/board/armadeus/apf27/fpga.c b/board/armadeus/apf27/fpga.c
new file mode 100644
index 0000000..47f4ffc
hooks/post-receive
--
armadeus
|
