[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-338-g009939f

[jorasse <jo...@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  009939f74d84757013559aa1f21d9e164179538d (commit)
      from  994cb0a0465e3c91f87074b5dfaf5f834a6240f7 (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 009939f74d84757013559aa1f21d9e164179538d
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jun 3 15:10:23 2012 +0200

    [UBOOT] apf28: bump to U-Boot 2012.04 - support battery as power supply

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

Summary of changes:
 buildroot/configs/apf28_defconfig                  |    6 ++--
 ...f28-u-boot-2011.12.h => apf28-u-boot-2012.04.h} |   31 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 5 deletions(-)
 copy buildroot/target/device/armadeus/apf28/{apf28-u-boot-2011.12.h => apf28-u-boot-2012.04.h} (90%)

diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 2e80169..cbb36f3 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -61,10 +61,10 @@ BR2_TARGET_ROOTFS_UBI=y
 BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2011.12.h"
+BR2_TARGET_UBOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2011.12.tar.bz2"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2011.12"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2012.04.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2012.04"
 BR2_TARGET_UBOOT_FORMAT_SB=y
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
similarity index 90%
copy from buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
copy to buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index 5da1a50..b1ed6fa 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -26,7 +26,7 @@
 
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION 	"1.0"
-#define CONFIG_IDENT_STRING	" apf28 patch 1.0"
+#define CONFIG_IDENT_STRING	" apf28 patch 1.1"
 #define CONFIG_BOARD_NAME	apf28
 
 /*
@@ -39,6 +39,7 @@
  * Enable the call to miscellaneous platform dependent initialization.
  */
 #define CONFIG_SYS_NO_FLASH	/* to be define before <config_cmd_default.h> */
+#define CONFIG_SYS_DCACHE_OFF
 #define	CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_LATE_INIT
 #define	CONFIG_ARCH_CPU_INIT
@@ -60,6 +61,32 @@
 #define	CONFIG_SPL_LIBCOMMON_SUPPORT
 #define	CONFIG_SPL_LIBGENERIC_SUPPORT
 
+/* Enable CONFIG_SYS_NO_DCDC_BATT_SOURCE the following if you only have a
+ * VDD5V source only and no DCDC_BATT source. This includes configurations with
+ * and without a supercap on the BATTERY pin as shown in the i.MX28 reference
+ * schematic.
+ *
+ * NOTE: If both a DCDC_BATT and VDD5V source are present, this is not meant to
+ * select which one to use. This is only for hardware configurations without
+ * DCDC_BATT power source.
+ */
+/* #define CONFIG_SYS_NO_DCDC_BATT_SOURCE */
+
+/* Enable CONFIG_SYS_NO_VDD5V_SOURCE the following if you only have a DCDC_BATT
+ * source only and no VDD5V. This includes configurations with and without a
+ * supercap on the BATTERY pin as shown in the i.MX28 reference schematic.
+ *
+ * NOTE: If both a DCDC_BATT and VDD5V source are present, this is not meant to
+ * select which one to use.  This is only for hardware configurations without
+ * VDD5V power source.
+*/
+/* #define CONFIG_SYS_NO_VDD5V_SOURCE */
+
+/* Enable CONFIG_SYS_VBUS_CURRENT_DRAW the following if VDD5V is sourced from
+ * VBUS. Limit the current to 100mA
+ */
+/* #define CONFIG_SYS_VBUS_CURRENT_DRAW */
+
 /*
  * BOOTP options
  */
@@ -320,7 +347,7 @@
 #define	CONFIG_MII
 #define	CONFIG_DISCOVER_PHY
 #define	CONFIG_FEC_XCV_TYPE		RMII
-#define CONFIG_M28_FEC_MAC_IN_OCOTP
+#define CONFIG_MX28_FEC_MAC_IN_OCOTP
 #define CONFIG_NETCONSOLE		1
 #endif
 #define ACFG_OUI	0x001EAC


hooks/post-receive
-- 
armadeus