[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-41-ge09bbaa
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-41-ge09bbaa
|
From: jorasse <jo...@us...> - 2012-02-12 23:47:41
|
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 e09bbaa83698e97f7755564d5382106703888a37 (commit)
from 0c68c37e56ee71da3d42fcf48023116c2cf0f212 (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 e09bbaa83698e97f7755564d5382106703888a37
Author: Eric Jarrige <eri...@ar...>
Date: Mon Feb 13 00:45:26 2012 +0100
[UBOOT] apf28: Fix memory corruption while computing RAM size - Fix typo - Move static IP config to Buildroot world
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf28_defconfig | 6 +++++-
.../device/armadeus/apf28/apf28-u-boot-2011.12.h | 11 +----------
.../u-boot/2011.12/501-imx28-update-and-fix.patch | 11 +++++++++++
patches/u-boot/2011.12/502-add-apf28.patch | 2 +-
4 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 4a1a695..bad767e 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -36,6 +36,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(ARMADEUS_PATH)/rootfs/post_build.sh"
BR2_TARGET_ARMADEUS=y
BR2_BOARD_NAME="apf28"
BR2_CPU_NAME="imx28"
+BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
BR2_PACKAGE_IMXREGS=y
BR2_PACKAGE_STRACE=y
@@ -65,7 +66,10 @@ 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_TOOL_ENV=y
-# BR2_TARGET_UBOOT_NETWORK is not set
+BR2_TARGET_UBOOT_SERVERIP="192.168.0.2"
+BR2_TARGET_UBOOT_IPADDR="192.168.0.10"
+BR2_TARGET_UBOOT_GATEWAY="192.168.0.1"
+BR2_TARGET_UBOOT_ETHADDR=""
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
index 997f950..2ea3539 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2011.12.h
@@ -27,7 +27,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "0.3"
-#define CONFIG_IDENT_STRING " apf28 patch 0.4"
+#define CONFIG_IDENT_STRING " apf28 patch 0.5"
/*
* SoC configurations
@@ -70,12 +70,8 @@
#define CONFIG_BOOTP_DNS2
*/
-#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_IPADDR 192.168.0.10
#define CONFIG_BOARD_NAME "apf28"
#define CONFIG_HOSTNAME "apf28"
-#define CONFIG_GATEWAYIP 192.168.0.1
-#define CONFIG_SERVERIP 192.168.0.2
#define CONFIG_SRV_PATH ""
#define CONFIG_ROOTPATH "/tftpboot/apf28-root"
@@ -103,7 +99,6 @@
#define CONFIG_CMD_ASKENV /* ask for env variable */
#define CONFIG_CMD_BSP /* Board Specific functions */
-/*#define CONFIG_CMD_IIM*/ /* imx iim fuse */
#define CONFIG_CMD_NAND_LOCK_UNLOCK
#define CONFIG_CMD_NAND_TRIMFFS
@@ -410,7 +405,3 @@
#endif /* __APF28_H__ */
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME apf28
diff --git a/patches/u-boot/2011.12/501-imx28-update-and-fix.patch b/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
index bd77201..d106c67 100644
--- a/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
+++ b/patches/u-boot/2011.12/501-imx28-update-and-fix.patch
@@ -48,4 +48,15 @@ diff -purN u-boot-custom.ori/Makefile u-boot-custom/Makefile
void mx28_mem_init_clock(void)
{
struct mx28_clkctrl_regs *clkctrl_regs =
+--- u-boot-2011.12/common/memsize.c 2011-12-23 20:25:35.000000000 +0100
++++ u-boot-2011.12/common/memsize.c 2012-02-12 23:51:07.635786967 +0100
+@@ -74,6 +74,8 @@ long get_ram_size(long *base, long maxsi
+ return (0);
+ }
+
++ sync ();
++ *addr = save[i];
+ for (cnt = 1; cnt < maxsize / sizeof (long); cnt <<= 1) {
+ addr = base + cnt; /* pointer arith! */
+ val = *addr;
diff --git a/patches/u-boot/2011.12/502-add-apf28.patch b/patches/u-boot/2011.12/502-add-apf28.patch
index 1847f90..86a50dd 100644
--- a/patches/u-boot/2011.12/502-add-apf28.patch
+++ b/patches/u-boot/2011.12/502-add-apf28.patch
@@ -1064,7 +1064,7 @@
+ goto err2;
+ }
+
-+ printf("NAND BCB tables updated\n");
++ printf("NAND BCB tables updated\n");
+ ret = 0;
+
+err2:
hooks/post-receive
--
armadeus
|
