[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-567-g3a7d493
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2015-01-30 11:18:53
|
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 3a7d49312fc14e5a1362343e70bd5c3ff148e1e2 (commit)
from bd2171f86246b8348a2568263e263db8c098823c (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 3a7d49312fc14e5a1362343e70bd5c3ff148e1e2
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 30 12:18:15 2015 +0100
[U-BOOT] 2014.07: APF6: add CONFIG_ZERO_BOOTDELAY_CHECK, officialize update_rootfs and cleanup a little the default config
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
index 2fbd45c..4d0aabc 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2014.07.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Armadeus Systems
+ * Copyright (C) 2013-2015 Armadeus Systems
*
* Configuration settings for the APF6.
*
@@ -16,7 +16,7 @@
#define CONFIG_SYS_GENERIC_BOARD
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 4
+#define CONFIG_ENV_VERSION 5
#define CONFIG_BOARD_NAME apf6
/* SPL */
@@ -79,6 +79,7 @@
#define CONFIG_CMD_USB_MASS_STORAGE
#define CONFIG_BOOTDELAY 5
+#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_SYS_MEMTEST_START 0x10000000
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
@@ -137,17 +138,16 @@
#define CONFIG_USB_GADGET
#define CONFIG_USB_GADGET_DUALSPEED
#define CONFIG_USB_GADGET_MASS_STORAGE
-#define CONFIG_USB_GADGET_VBUS_DRAW 2
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
#define CONFIG_USBDOWNLOAD_GADGET
-#define CONFIG_G_DNL_VENDOR_NUM 0x0525
-#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
-#define CONFIG_G_DNL_MANUFACTURER "Armadeus Systems"
+#define CONFIG_G_DNL_VENDOR_NUM 0x0525
+#define CONFIG_G_DNL_PRODUCT_NUM 0xa4a5
+#define CONFIG_G_DNL_MANUFACTURER "Armadeus Systems"
/* PCIE */
#define CONFIG_PCI
#define CONFIG_PCI_PNP
#define CONFIG_PCIE_IMX
-#define CONFIG_PCIE_IMX_POWER_GPIO IMX_GPIO_NR(6, 2)
/* FPGA */
#define CONFIG_FPGA_COUNT 1
@@ -249,7 +249,7 @@
"fi; " \
"fi;\0" \
"update_rootfs=run download_rootfs flash_rootfs\0" \
- "update_all=run update_kernel update_dtb update_uboot\0" \
+ "update_all=run update_kernel update_rootfs update_dtb update_uboot\0" \
"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${board_name}-linux.bin\0" \
"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /dtbs/${fdt_file}\0" \
"addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:" \
hooks/post-receive
--
armadeus
|