[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-615-gb8a4621
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-615-gb8a4621
|
From: Julien B a. A. <ar...@us...> - 2015-02-19 16:16: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 b8a4621a225d44cbc94708c0c5e8a1b8be6f535b (commit)
via 1cfbdf5f25d8fd972947327c78add9aab2b3c04d (commit)
via a416a04ccc56df524b4436158bd0aad220267c53 (commit)
from dffc5c7fdd62e1412cadfb6060beb7b595047340 (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 b8a4621a225d44cbc94708c0c5e8a1b8be6f535b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 19 17:16:00 2015 +0100
[U-BOOT] apf6: 2014.07 & 2015.01: add USB keyboard support (not all keyboards seem supported git status)
commit 1cfbdf5f25d8fd972947327c78add9aab2b3c04d
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 19 12:09:54 2015 +0100
[BUILD] improve Makefile.in to get ARMADEUS_BUSYBOX_VERSION with every BR version
commit a416a04ccc56df524b4436158bd0aad220267c53
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 18 16:04:02 2015 +0100
[BUILDROOT] 2013.11: Make fw_printenv command work on APF6
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 10 ++-
.../device/armadeus/apf6/apf6-u-boot-2014.07.h | 1 +
.../device/armadeus/apf6/apf6-u-boot-2015.01.h | 1 +
.../rootfs/target_skeleton/etc/fw_env_apf6.config | 7 ++
...2013.10-to-fix-bug-in-fw_printenv-on-apf6.patch | 85 ++++++++++++++++++++
patches/buildroot/2013.11/cleanup_buildroot.sh | 1 +
6 files changed, 101 insertions(+), 4 deletions(-)
create mode 100644 buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env_apf6.config
create mode 100644 patches/buildroot/2013.11/019-armadeus-uboot-tools-use-a-2014.07-patch-on-2013.10-to-fix-bug-in-fw_printenv-on-apf6.patch
diff --git a/Makefile.in b/Makefile.in
index 061fab9..56389b6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,11 +42,13 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
ARMADEUS_LIBC_NAME=glibc
endif
-# Comment the following line with BR 2015.02
+ifneq ($(BR2_BUSYBOX_VERSION),)
+# pre 2014.11 BR
ARMADEUS_BUSYBOX_VERSION:=$(shell echo $(BR2_BUSYBOX_VERSION))
-
-# Uncomment the following line with BR 2015.02
-#ARMADEUS_BUSYBOX_VERSION:=$(shell egrep "BUSYBOX_VERSION =" $(BUILDROOT_DIR)/package/busybox/busybox.mk 2>/dev/null | cut -d ' ' -f 3)
+else
+# post 2014.11 BR
+ARMADEUS_BUSYBOX_VERSION:=$(shell egrep "BUSYBOX_VERSION =" $(BUILDROOT_DIR)/package/busybox/busybox.mk 2>/dev/null | cut -d ' ' -f 3)
+endif
ARMADEUS_BOARD_NAME:=$(shell echo $(BR2_BOARD_NAME))
ARMADEUS_U_BOOT_BOARD_NAME:=$(shell echo $(BR2_TARGET_UBOOT_BOARDNAME))
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 4d0aabc..ed7629c 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
@@ -133,6 +133,7 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#define CONFIG_USB_KEYBOARD
/* Gadget part */
#define CONFIG_CI_UDC
#define CONFIG_USB_GADGET
diff --git a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
index 4d0aabc..ed7629c 100644
--- a/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
+++ b/buildroot/target/device/armadeus/apf6/apf6-u-boot-2015.01.h
@@ -133,6 +133,7 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#define CONFIG_USB_KEYBOARD
/* Gadget part */
#define CONFIG_CI_UDC
#define CONFIG_USB_GADGET
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env_apf6.config b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env_apf6.config
new file mode 100644
index 0000000..57bc4ec
--- /dev/null
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/fw_env_apf6.config
@@ -0,0 +1,7 @@
+# Configuration file for fw_(printenv/saveenv) utility on >>> APF6 <<<.
+# Up to two entries are valid, in this case the redundant environment sector is
+# assumed present.
+
+# Block device name Device offset Env. size
+/dev/mmcblk2boot0 0x100000 0x2800
+/dev/mmcblk2boot0 0x180000 0x2800
diff --git a/patches/buildroot/2013.11/019-armadeus-uboot-tools-use-a-2014.07-patch-on-2013.10-to-fix-bug-in-fw_printenv-on-apf6.patch b/patches/buildroot/2013.11/019-armadeus-uboot-tools-use-a-2014.07-patch-on-2013.10-to-fix-bug-in-fw_printenv-on-apf6.patch
new file mode 100644
index 0000000..be17875
--- /dev/null
+++ b/patches/buildroot/2013.11/019-armadeus-uboot-tools-use-a-2014.07-patch-on-2013.10-to-fix-bug-in-fw_printenv-on-apf6.patch
@@ -0,0 +1,85 @@
+Allow /dev/mmcblk2boot0 usage in /etc/fw_env.config
+
+Integrated since uboot-tools 2014.07.
+
+Index: buildroot/package/uboot-tools/uboot-tools-2013.10-fw_env-switch-get-config-to-use-ms-in-sscanf.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/uboot-tools/uboot-tools-2013.10-fw_env-switch-get-config-to-use-ms-in-sscanf.patch 2015-01-29 12:28:55.676698363 +0100
+@@ -0,0 +1,76 @@
++From: Tom Rini <tr...@ti...>
++Date: Fri, 28 Mar 2014 16:03:33 +0000 (-0400)
++Subject: fw_env.c: Switch get_config to use '%ms' in sscanf
++X-Git-Tag: v2014.07-rc1~2^2~3^2~42
++X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=229695fee97abc7f4adad92eb8e036792c144bc6
++
++fw_env.c: Switch get_config to use '%ms' in sscanf
++
++We currently limit ourself to 16 characters for the device name to read
++the environment from. This is insufficient for /dev/mmcblk0boot1 to
++work for example. Switch to '%ms' which gives us a dynamically
++allocated buffer instead. We're short lived enough to not bother
++free()ing the buffer.
++
++Signed-off-by: Tom Rini <tr...@ti...>
++---
++
++diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
++index d228cc3..f5cd521 100644
++--- a/tools/env/fw_env.c
+++++ b/tools/env/fw_env.c
++@@ -40,7 +40,7 @@
++ _min1 < _min2 ? _min1 : _min2; })
++
++ struct envdev_s {
++- char devname[16]; /* Device name */
+++ const char *devname; /* Device name */
++ ulong devoff; /* Device offset */
++ ulong env_size; /* environment size */
++ ulong erase_size; /* device erase size */
++@@ -1243,7 +1243,7 @@ static int parse_config ()
++ return -1;
++ }
++ #else
++- strcpy (DEVNAME (0), DEVICE1_NAME);
+++ DEVNAME (0) = DEVICE1_NAME;
++ DEVOFFSET (0) = DEVICE1_OFFSET;
++ ENVSIZE (0) = ENV1_SIZE;
++ /* Default values are: erase-size=env-size */
++@@ -1258,7 +1258,7 @@ static int parse_config ()
++ #endif
++
++ #ifdef HAVE_REDUND
++- strcpy (DEVNAME (1), DEVICE2_NAME);
+++ DEVNAME (1) = DEVICE2_NAME;
++ DEVOFFSET (1) = DEVICE2_OFFSET;
++ ENVSIZE (1) = ENV2_SIZE;
++ /* Default values are: erase-size=env-size */
++@@ -1297,6 +1297,7 @@ static int get_config (char *fname)
++ int i = 0;
++ int rc;
++ char dump[128];
+++ char *devname;
++
++ fp = fopen (fname, "r");
++ if (fp == NULL)
++@@ -1307,8 +1308,8 @@ static int get_config (char *fname)
++ if (dump[0] == '#')
++ continue;
++
++- rc = sscanf (dump, "%s %lx %lx %lx %lx",
++- DEVNAME (i),
+++ rc = sscanf (dump, "%ms %lx %lx %lx %lx",
+++ &devname,
++ &DEVOFFSET (i),
++ &ENVSIZE (i),
++ &DEVESIZE (i),
++@@ -1317,6 +1318,8 @@ static int get_config (char *fname)
++ if (rc < 3)
++ continue;
++
+++ DEVNAME(i) = devname;
+++
++ if (rc < 4)
++ /* Assume the erase size is the same as the env-size */
++ DEVESIZE(i) = ENVSIZE(i);
diff --git a/patches/buildroot/2013.11/cleanup_buildroot.sh b/patches/buildroot/2013.11/cleanup_buildroot.sh
index f8ada55..20d3bd1 100755
--- a/patches/buildroot/2013.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2013.11/cleanup_buildroot.sh
@@ -168,6 +168,7 @@ rm -rf buildroot/package/snes9x/snes9x.mk
rm -rf buildroot/package/tk/Config.in
rm -rf buildroot/package/tk/tk.mk
rm -rf buildroot/package/uboot-tools/2013.01/uboot-tools-2013.01-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
+rm -rf buildroot/package/uboot-tools/uboot-tools-2013.10-fw_env-switch-get-config-to-use-ms-in-sscanf.patch
rm -rf buildroot/package/uboot-tools/uboot-tools-2013.10-Ignore-env_sectors-on-NOR-and-SPI-dataflash.patch
rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0055-accept4-declaration-fix.patch
rm -rf buildroot/package/uclibc/0.9.33.2/uclibc-0056-assume-accept4-in-recent-arm-kernels.patch
hooks/post-receive
--
armadeus
|