armadeus-commitlog Mailing List for armadeus (Page 58)

Brought to you by: sszy

armadeus-commitlog — Armadeus GIT commit logs

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2007	Jan (43)	Feb (8)	Mar (7)	Apr (8)	May (14)	Jun (6)	Jul (4)	Aug (17)	Sep (18)	Oct (19)	Nov (52)	Dec (30)
2008	Jan (6)	Feb (6)	Mar (15)	Apr (22)	May (13)	Jun (11)	Jul (41)	Aug (10)	Sep (14)	Oct (21)	Nov (4)	Dec (66)
2009	Jan (67)	Feb (57)	Mar (90)	Apr (54)	May (64)	Jun (76)	Jul (14)	Aug (18)	Sep (18)	Oct (20)	Nov (15)	Dec (36)
2010	Jan (28)	Feb (25)	Mar (32)	Apr (23)	May (22)	Jun (62)	Jul (36)	Aug (16)	Sep (12)	Oct (20)	Nov (44)	Dec (25)
2011	Jan (36)	Feb (49)	Mar (28)	Apr (38)	May (26)	Jun (52)	Jul (33)	Aug (32)	Sep (19)	Oct (26)	Nov (13)	Dec (32)
2012	Jan (38)	Feb (34)	Mar (91)	Apr (35)	May (31)	Jun (72)	Jul (23)	Aug (13)	Sep (33)	Oct (47)	Nov (18)	Dec (22)
2013	Jan (31)	Feb (22)	Mar (26)	Apr (11)	May (38)	Jun (15)	Jul (37)	Aug (68)	Sep (34)	Oct (11)	Nov (26)	Dec (31)
2014	Jan (60)	Feb (55)	Mar (21)	Apr (31)	May (17)	Jun (35)	Jul (24)	Aug (17)	Sep (11)	Oct (23)	Nov (10)	Dec (23)
2015	Jan (15)	Feb (34)	Mar (46)	Apr (23)	May (12)	Jun (14)	Jul (18)	Aug (22)	Sep (6)	Oct (2)	Nov (1)	Dec (6)
2016	Jan (5)	Feb (7)	Mar (10)	Apr (10)	May (17)	Jun (6)	Jul (4)	Aug (6)	Sep (22)	Oct (8)	Nov (9)	Dec (5)
2017	Jan (11)	Feb (12)	Mar (27)	Apr (9)	May (1)	Jun (5)	Jul (11)	Aug (10)	Sep (6)	Oct (10)	Nov (4)	Dec (6)
2018	Jan (6)	Feb (13)	Mar (9)	Apr (7)	May (10)	Jun (9)	Jul (21)	Aug (13)	Sep (10)	Oct (4)	Nov (6)	Dec (1)
2019	Jan (6)	Feb (2)	Mar (5)	Apr (6)	May (19)	Jun (14)	Jul (18)	Aug (3)	Sep (5)	Oct (7)	Nov (8)	Dec (4)
2020	Jan (10)	Feb (3)	Mar (9)	Apr (7)	May (2)	Jun (18)	Jul (3)	Aug	Sep	Oct (7)	Nov	Dec (1)
2021	Jan (9)	Feb (6)	Mar (4)	Apr (11)	May (7)	Jun (5)	Jul (2)	Aug (4)	Sep (10)	Oct (9)	Nov (5)	Dec
2022	Jan (2)	Feb (12)	Mar (3)	Apr (5)	May (1)	Jun (3)	Jul (2)	Aug (1)	Sep (4)	Oct (4)	Nov (1)	Dec (3)
2023	Jan (5)	Feb (3)	Mar (3)	Apr (2)	May (1)	Jun (3)	Jul (3)	Aug (2)	Sep (1)	Oct (1)	Nov	Dec (4)
2024	Jan (2)	Feb (3)	Mar (8)	Apr (4)	May (1)	Jun (13)	Jul (7)	Aug (1)	Sep (6)	Oct (5)	Nov (11)	Dec (7)
2025	Jan (3)	Feb (1)	Mar (6)	Apr (4)	May (4)	Jun (1)	Jul (1)	Aug (7)	Sep (4)	Oct (4)	Nov (4)	Dec (1)
2026	Jan (3)	Feb (7)	Mar (3)	Apr (1)	May (6)	Jun (3)	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 56 57 58 59 60 .. 153 > >> (Page 58 of 153)

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-384-gff075ad

From: jorasse <jo...@us...> - 2013-08-14 15:42:57

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  ff075adbaf92fa902faa4f41528f0bcdc1886273 (commit)
      from  8559ed82c85ad7747e012acb5863eef510ecb3ab (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 ff075adbaf92fa902faa4f41528f0bcdc1886273
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Aug 14 17:52:37 2013 +0200

    [BUILDROOT] apf27: update config to export fpga firmware blinking_led by default to be handle by U-Boot

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

Summary of changes:
 buildroot/configs/apf27_defconfig     |    3 +++
 buildroot/configs/apf27test_defconfig |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 7229bc2..0c60dbe 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -33,6 +33,9 @@ BR2_BOARD_NAME="apf27"
 BR2_CPU_NAME="imx27"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
 BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
 BR2_PACKAGE_IMXREGS=y
 BR2_PACKAGE_MAX5821CTRL=y
 BR2_PACKAGE_AD9889CTRL=y
diff --git a/buildroot/configs/apf27test_defconfig b/buildroot/configs/apf27test_defconfig
index c9e1bb7..1bf6fa5 100644
--- a/buildroot/configs/apf27test_defconfig
+++ b/buildroot/configs/apf27test_defconfig
@@ -50,6 +50,9 @@ BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
 BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
 BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020=y
 BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf27_200k.bit"
+BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
 BR2_PACKAGE_IMXREGS=y
 BR2_PACKAGE_MAX5821CTRL=y
 BR2_PACKAGE_ARMADEUS_TESTSUITE=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-383-g8559ed8

From: jorasse <jo...@us...> - 2013-08-14 15:37:16

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  8559ed82c85ad7747e012acb5863eef510ecb3ab (commit)
      from  cbff11f85eb7b4ed57f6aa629ce53e07723f57ed (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 8559ed82c85ad7747e012acb5863eef510ecb3ab
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Aug 14 17:46:54 2013 +0200

    [BUILDROOT] apf9328: update config to export fpga firmware blinking_led by default to be handle by U-Boot

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

Summary of changes:
 buildroot/configs/apf9328_defconfig     |    3 +++
 buildroot/configs/apf9328test_defconfig |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index c9686e4..3b3e243 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -35,6 +35,9 @@ BR2_CPU_NAME="imxl"
 BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
 BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
+BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
 BR2_PACKAGE_IMXREGS=y
 BR2_PACKAGE_MAX5821CTRL=y
 BR2_PACKAGE_CH7024CTRL=y
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 1e7341f..89fc550 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -51,6 +51,9 @@ BR2_PACKAGE_ARMADEUS_DEMOS_SHOW_IMAGE=y
 BR2_PACKAGE_ARMADEUS_DEMOS_TEST_LCD=y
 BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020=y
 BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
+BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE="$(TOPDIR)/../firmware/leds/blinking_led/bin/blinking_led_apf9328_200k.bit"
+BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
 BR2_PACKAGE_IMXREGS=y
 BR2_PACKAGE_MAX5821CTRL=y
 BR2_PACKAGE_ARMADEUS_TESTSUITE=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-382-gcbff11f

From: jorasse <jo...@us...> - 2013-08-14 15:18:59

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  cbff11f85eb7b4ed57f6aa629ce53e07723f57ed (commit)
      from  db36edecbf48dc80942d3e0d3aeea3eda6ecf9e2 (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 cbff11f85eb7b4ed57f6aa629ce53e07723f57ed
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Aug 14 17:28:38 2013 +0200

    [BUILDROOT] apf51: export dual UART FPGA firmware for GSM/GPS to be handle by U-Boot

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

Summary of changes:
 buildroot/configs/apf51_defconfig     |    1 +
 buildroot/configs/apf51test_defconfig |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 92bf62d..1ba1720 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -39,6 +39,7 @@ BR2_PACKAGE_BUSYBOX_CONFIG="$(ARMADEUS_PATH)/busybox-$(BR2_BUSYBOX_VERSION).conf
 BR2_PACKAGE_FPGAREGS=y
 BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
 BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
+BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
 BR2_PACKAGE_IMXREGS=y
 BR2_PACKAGE_TFP410CTRL=y
 BR2_PACKAGE_ALSA_UTILS=y
diff --git a/buildroot/configs/apf51test_defconfig b/buildroot/configs/apf51test_defconfig
index e03a633..bef1030 100644
--- a/buildroot/configs/apf51test_defconfig
+++ b/buildroot/configs/apf51test_defconfig
@@ -55,6 +55,7 @@ BR2_PACKAGE_ARMADEUS_DEMOS_MCP25020=y
 BR2_PACKAGE_FPGAREGS=y
 BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE=y
 BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART=y
+BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE=y
 BR2_PACKAGE_IMXREGS=y
 BR2_PACKAGE_ARMADEUS_TESTSUITE=y
 BR2_PACKAGE_TFP410CTRL=y


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-381-gdb36ede

From: jorasse <jo...@us...> - 2013-08-14 15:14:27

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  db36edecbf48dc80942d3e0d3aeea3eda6ecf9e2 (commit)
      from  bcfd76b8de9d3113336c85bda6d08b853e2a6e43 (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 db36edecbf48dc80942d3e0d3aeea3eda6ecf9e2
Author: Eric Jarrige <eri...@ar...>
Date:   Wed Aug 14 17:23:55 2013 +0200

    [BUILDROOT] fpga_firmware: add option to use some custom fpga firmware and provide a link to be used by U-Boot

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

Summary of changes:
 buildroot/package/armadeus/fpga_firmware/Config.in |   32 ++++++++++++++++---
 .../armadeus/fpga_firmware/fpga_firmware.mk        |   19 ++++++++++-
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/buildroot/package/armadeus/fpga_firmware/Config.in b/buildroot/package/armadeus/fpga_firmware/Config.in
index 41f9604..40c97e8 100644
--- a/buildroot/package/armadeus/fpga_firmware/Config.in
+++ b/buildroot/package/armadeus/fpga_firmware/Config.in
@@ -1,15 +1,37 @@
 config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
 	bool "FPGA Firmware"
 	help
-	  Install some required/mandatory FPGA firmwares.
+	  Install some FPGA firmwares.
 
-menu "Choose the firmware to install"
-	depends on BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+if BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
+choice
+	prompt "Firmware to install"
+	default BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
 
 config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART
 	bool "APF51 dual UARTs (GSM/GPS)"
 	help
 	  Required if your want to use GSM or GPS on the APF51Dev. Firmware
-	  will be named /firmware/fpga/apf51_gsm_gps_firmware.bin.
+	  will be named /lib/firmware/fpga/apf51_gsm_gps_firmware.bin.
 
-endmenu
+config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
+	bool "Install a custom FPGA firmware"
+	help
+	  Use a custom FPGA binary file. The FPGA binary file will be
+	  installed in /lib/firmware/fpga/ on the target.
+
+endchoice
+
+config BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE
+	string "FPGA binary file path to install"
+	depends on BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM
+	help
+	  Path to your custom FPGA binary file to install.
+
+config BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE
+	bool "Export this file to Buildroot images folder"
+	help
+	  Build a link from Buildroot binary folder to the fpga firmware.
+	  This link will be named $(BOARD_NAME)-firmware.bin 
+
+endif # BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE
diff --git a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
index 96dbfed..46b913f 100644
--- a/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
+++ b/buildroot/package/armadeus/fpga_firmware/fpga_firmware.mk
@@ -4,9 +4,14 @@
 #
 #############################################################
 
-ifneq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART)),)
-FIRMWARES += $(BASE_DIR)/../../firmware/pod_scripts/apf51_gsm_gps_firmware.bin
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_APF51_DUAL_UART)),y)
+FPGA_FIRMWARE = $(BASE_DIR)/../../firmware/pod_scripts/apf51_gsm_gps_firmware.bin
 endif
+ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM)),y)
+FPGA_FIRMWARE = $(call qstrip,$(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE_CUSTOM_FILE))
+endif
+
+FIRMWARES += $(FPGA_FIRMWARE)
 FPGA_FIRMWARE_TARGET_DIR:=/lib/firmware/fpga/
 
 $(STAMP_DIR)/.fpga_firmware_installed:
@@ -15,6 +20,9 @@ $(STAMP_DIR)/.fpga_firmware_installed:
 	for firmware in $(FIRMWARES); do \
 		$(INSTALL) -m 0755 $$firmware $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR) ; \
 	done
+ifeq ($(BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE),y)
+	ln -sf $(FPGA_FIRMWARE) $(BINARIES_DIR)/$(BOARD_NAME)-firmware.bin
+endif
 	touch $@
 
 fpga-firmware: $(STAMP_DIR)/.fpga_firmware_installed
@@ -26,6 +34,13 @@ fpga-firmware-clean:
 		rm -f $(TARGET_DIR)/$(FPGA_FIRMWARE_TARGET_DIR)/$$firmname ; \
 	done
 	rm -f $(STAMP_DIR)/.fpga_firmware_installed
+ifeq ($(BR2_PACKAGE_ARMADEUS_EXPORT_FPGA_FIRMWARE),y)
+	rm -f $(BINARIES_DIR)/$(BOARD_NAME)-firmware.bin
+endif
+
+fpga-firmware-dirclean: fpga-firmware-clean
+
+fpga-firmware-rebuild: fpga-firmware-clean fpga-firmware
 
 ifeq ($(strip $(BR2_PACKAGE_ARMADEUS_FPGA_FIRMWARE)),y)
 TARGETS+=fpga-firmware


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-380-gbcfd76b

From: jorasse <jo...@us...> - 2013-08-13 09:04:37

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  bcfd76b8de9d3113336c85bda6d08b853e2a6e43 (commit)
       via  c3e3c9b96fe5b04e6b6c89e6708f0d1f666d369d (commit)
      from  0d2d01a8f6f486764e112783ba42e15761862503 (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 bcfd76b8de9d3113336c85bda6d08b853e2a6e43
Merge: c3e3c9b 0d2d01a
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Aug 13 11:14:05 2013 +0200

    Merge branch 'master' of ssh://git.code.sf.net/p/armadeus/code

commit c3e3c9b96fe5b04e6b6c89e6708f0d1f666d369d
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Aug 13 11:13:58 2013 +0200

    [BUILDROOT] update pps51 config to BuidlRoot 2013.05 and U-Boot 3012.04

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

Summary of changes:
 buildroot/configs/pps51_defconfig |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/buildroot/configs/pps51_defconfig b/buildroot/configs/pps51_defconfig
index 2e612e5..76c267e 100644
--- a/buildroot/configs/pps51_defconfig
+++ b/buildroot/configs/pps51_defconfig
@@ -11,7 +11,7 @@ BR2_OPTIMIZE_2=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.38.8"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_GCC_VERSION_4_4_X=y
+BR2_BINUTILS_VERSION_2_23_2=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST="C en_US"
@@ -62,13 +62,23 @@ BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9=y
 BR2_PACKAGE_DBUS=y
 BR2_PACKAGE_I2C_TOOLS=y
 BR2_PACKAGE_UBOOT_TOOLS=y
+BR2_PACKAGE_OPENSSL_BIN=y
+BR2_PACKAGE_OPENSSL_ENGINES=y
 BR2_PACKAGE_TSLIB=y
 BR2_PACKAGE_LIBXML2=y
+BR2_PACKAGE_BOA=y
 BR2_PACKAGE_BLUEZ3_UTILS=y
+BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_IPSEC_TOOLS=y
+BR2_PACKAGE_IPSEC_TOOLS_NATT=y
+BR2_PACKAGE_IPSEC_TOOLS_FRAG=y
+BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_NTP=y
 # BR2_PACKAGE_NTP_NTPD is not set
+BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_PORTMAP=y
 BR2_PACKAGE_PPPD=y
 BR2_PACKAGE_UUCP=y
@@ -86,16 +96,20 @@ BR2_TARGET_ROOTFS_UBI=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="apf51"
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2012.04.01.tar.bz2"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2012.04"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2013.04.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
 BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
-BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(ARMADEUS_PATH)/apf51/apf51-u-boot-2013.04.h"
+BR2_LINUX_UBOOT_USE_CUSTOM_FORMAT=y
+BR2_LINUX_UBOOT_CUSTOM_FORMAT_NAME="u-boot-with-nand-spl.imx"
 BR2_TARGET_UBOOT_NETWORK=y
 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_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38.8"


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-378-g0d2d01a

From: jorasse <jo...@us...> - 2013-08-13 09:03:13

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  0d2d01a8f6f486764e112783ba42e15761862503 (commit)
      from  7383dd48f75c1a08e5788f14de05f4c50f9f2ba5 (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 0d2d01a8f6f486764e112783ba42e15761862503
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Aug 13 11:12:34 2013 +0200

    [BUILDROOT] update pps config to BuidlRoot 2013.05 and U-Boot 3012.04

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

Summary of changes:
 buildroot/configs/pps_defconfig                    |   12 +-
 .../device/armadeus/pps/pps-u-boot-2012.04.h       |   14 +-
 .../{pps-u-boot-2012.04.h => pps-u-boot-2013.04.h} |  242 ++++++++------------
 3 files changed, 104 insertions(+), 164 deletions(-)
 copy buildroot/target/device/armadeus/pps/{pps-u-boot-2012.04.h => pps-u-boot-2013.04.h} (79%)

diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 92e6a3d..51ae4de 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -1,5 +1,4 @@
 BR2_arm=y
-BR2_arm926t=y
 BR2_WGET="wget --passive-ftp --tries=3"
 BR2_DL_DIR="$(BASE_DIR)/../downloads"
 BR2_BACKUP_SITE="ftp://ftp2.armadeus.com/armadeusw/download"
@@ -10,7 +9,7 @@ BR2_STRIP_sstrip=y
 BR2_KERNEL_HEADERS_VERSION=y
 BR2_DEFAULT_KERNEL_VERSION="2.6.29.6"
 BR2_UCLIBC_CONFIG="target/device/armadeus/uClibc-$(BR2_UCLIBC_VERSION_STRING).config"
-BR2_GCC_VERSION_4_4_X=y
+BR2_BINUTILS_VERSION_2_23_2=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_TOOLCHAIN_BUILDROOT_LARGEFILE=y
@@ -76,16 +75,19 @@ BR2_TARGET_ROOTFS_UBI=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="apf27"
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2012.04.01.tar.bz2"
-BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2012.04"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="ftp://ftp.denx.de/pub/u-boot/u-boot-2013.04.tar.bz2"
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="../patches/u-boot/2013.04"
 BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2012.04.h"
+BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-2013.04.h"
 BR2_TARGET_UBOOT_FORMAT_NAND_BIN=y
 BR2_TARGET_UBOOT_NETWORK=y
 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_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
index ff1bc97..64e39af 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
@@ -25,7 +25,7 @@
 
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_ENV_VERSION 	"3.3"
-#define CONFIG_IDENT_STRING	" pps patch 3.8"
+#define CONFIG_IDENT_STRING	" pps patch 3.9"
 #define CONFIG_BOARD_NAME	pps
 
 /*
@@ -79,13 +79,13 @@
 #define CONFIG_CMD_ASKENV	/* ask for env variable		*/
 #define CONFIG_CMD_BSP		/* Board Specific functions	*/
 #define CONFIG_CMD_CACHE	/* icache, dcache		*/
-/*#define CONFIG_CMD_DATE */	/* support for RTC, date/time...*/
+#define CONFIG_CMD_DATE		/* support for RTC, date/time...*/
 #define CONFIG_CMD_DHCP		/* DHCP Support			*/
 #define CONFIG_CMD_DNS
-/*#define CONFIG_CMD_EEPROM */	/* EEPROM read/write support	*/
+#define CONFIG_CMD_EEPROM	/* EEPROM read/write support	*/
 /*#define CONFIG_CMD_EXT2*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
-/*#define CONFIG_CMD_I2C */	/* I2C serial bus support	*/
+#define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_IMX_FUSE	/* imx iim fuse                 */
 #define CONFIG_CMD_MII		/* MII support			*/
 /*#define CONFIG_CMD_MMC*/
@@ -387,12 +387,12 @@
 
 #ifdef CONFIG_CMD_I2C
 #define	CONFIG_HARD_I2C			1
-
+#define CONFIG_I2C_MXC
+#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_I2C_BASE		IMX_I2C1_BASE
 #define CONFIG_SYS_I2C_SPEED		100000	/* 100 kHz */
 #define CONFIG_SYS_I2C_SLAVE		0x7F
-
 #define CONFIG_I2C_CMD_TREE
-#define CONFIG_I2C_MULTI_BUS		2
 #define CONFIG_SYS_I2C_NOPROBES 	{ }
 
 #ifdef CONFIG_CMD_EEPROM
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h
similarity index 79%
copy from buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
copy to buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h
index ff1bc97..2bab38b 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2013.04.h
@@ -1,31 +1,14 @@
 /*
- *
- * Configuration settings for the Armadeus Project motherboard PPS27
- *
- * Copyright (C) 2008-2012 ej / Armadeus Project <eri...@ar...>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Copyright (C) 2008-2013 Eric Jarrige <eri...@ar...>
+ * SPDX-License-Identifier:Â Â Â Â Â GPL-2.0+
  */
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION 	"3.3"
-#define CONFIG_IDENT_STRING	" pps patch 3.8"
+#define CONFIG_ENV_VERSION 	10
+#define CONFIG_IDENT_STRING	" pps patch 3.10"
 #define CONFIG_BOARD_NAME	pps
 
 /*
@@ -33,15 +16,15 @@
  */
 #define CONFIG_ARM926EJS		/* this is an ARM926EJS CPU */
 #define CONFIG_MX27			/* in a Freescale i.MX27 Chip */
-#define CONFIG_MACH_TYPE 	1698	/* APF27 */
+#define CONFIG_MACH_TYPE	1698	/* APF27 */
 
 /*
  * 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_MISC_INIT_R
-
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#endif
 /*
  * Board display option
  */
@@ -53,9 +36,21 @@
  */
 #define CONFIG_NAND_U_BOOT
 /* Copy SPL+U-Boot here	     */
-#define CONFIG_SYS_NAND_U_BOOT_DST	CONFIG_SYS_LOAD_ADDR
+#define CONFIG_SYS_NAND_U_BOOT_DST	(CONFIG_SYS_TEXT_BASE - 0x800)
 /* Size is the partion size  */
-#define CONFIG_SYS_NAND_U_BOOT_SIZE	CONFIG_SYS_MONITOR_LEN 
+#define CONFIG_SYS_NAND_U_BOOT_SIZE	CONFIG_SYS_MONITOR_LEN
+/* Build image with spl and u-boot */
+#define CONFIG_NAND_U_BOOT
+#define CONFIG_SPL_PAD_TO		0xa0000800
+
+/*
+ * SPL
+ */
+#define	CONFIG_SPL
+#define CONFIG_SPL_TEXT_BASE            0xa0000000
+#define CONFIG_SPL_STACK                0xffffff00
+#define CONFIG_SYS_NAND_U_BOOT_START    0xa0000800
+#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x800
 
 /*
  * BOOTP options
@@ -68,8 +63,8 @@
 #define CONFIG_BOOTP_DNS
 #define CONFIG_BOOTP_DNS2
 
-#define CONFIG_HOSTNAME		CONFIG_BOARD_NAME
-#define CONFIG_ROOTPATH		"/tftpboot/" MK_STR(CONFIG_BOARD_NAME) "-root"
+#define CONFIG_HOSTNAME	CONFIG_BOARD_NAME
+#define CONFIG_ROOTPATH	"/tftpboot/" __stringify(CONFIG_BOARD_NAME) "-root"
 
 /*
  * U-Boot Commands
@@ -79,17 +74,17 @@
 #define CONFIG_CMD_ASKENV	/* ask for env variable		*/
 #define CONFIG_CMD_BSP		/* Board Specific functions	*/
 #define CONFIG_CMD_CACHE	/* icache, dcache		*/
-/*#define CONFIG_CMD_DATE */	/* support for RTC, date/time...*/
+#define CONFIG_CMD_DATE		/* support for RTC, date/time...*/
 #define CONFIG_CMD_DHCP		/* DHCP Support			*/
 #define CONFIG_CMD_DNS
-/*#define CONFIG_CMD_EEPROM */	/* EEPROM read/write support	*/
+#define CONFIG_CMD_EEPROM	/* EEPROM read/write support	*/
 /*#define CONFIG_CMD_EXT2*/
 #define CONFIG_CMD_FAT		/* FAT support			*/
-/*#define CONFIG_CMD_I2C */	/* I2C serial bus support	*/
-#define CONFIG_CMD_IMX_FUSE	/* imx iim fuse                 */
+#define CONFIG_CMD_I2C		/* I2C serial bus support	*/
+#define CONFIG_CMD_IMX_FUSE	/* imx iim fuse			*/
 #define CONFIG_CMD_MII		/* MII support			*/
 /*#define CONFIG_CMD_MMC*/
-#define CONFIG_CMD_MTDPARTS	/* MTD partition support 	*/
+#define CONFIG_CMD_MTDPARTS	/* MTD partition support	*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
 #define CONFIG_CMD_NAND_TRIMFFS
@@ -102,23 +97,22 @@
 /*
  * Memory configurations
  */
-#define CONFIG_NR_DRAM_POPULATED	1
+#define CONFIG_NR_DRAM_POPULATED 1
 #define CONFIG_NR_DRAM_BANKS	2
 
-#define CONFIG_SYS_SDRAM_MBYTE_SYZE 64
+#define ACFG_SDRAM_MBYTE_SYZE 64
 
-#define PHYS_SDRAM_1 			0xA0000000
-#define PHYS_SDRAM_2 			0xB0000000
+#define PHYS_SDRAM_1			0xA0000000
+#define PHYS_SDRAM_2			0xB0000000
 #define CONFIG_SYS_SDRAM_BASE		PHYS_SDRAM_1
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (512<<10) )
-#define CONFIG_SYS_GBL_DATA_SIZE	256		/* Initial data */
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (512<<10))
 #define CONFIG_SYS_MEMTEST_START	0xA0000000	/* memtest test area  */
 #define CONFIG_SYS_MEMTEST_END		0xA0300000	/* 3 MiB RAM test */
 
 #define CONFIG_SYS_INIT_SP_ADDR	(CONFIG_SYS_SDRAM_BASE	\
 		+ PHYS_SDRAM_1_SIZE - 0x0100000)
 
-#define CONFIG_SYS_TEXT_BASE	0xA1000000
+#define CONFIG_SYS_TEXT_BASE	0xA0000800
 
 /*
  * FLASH organization
@@ -135,6 +129,7 @@
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)	/* +512kB */
 #define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE	/* 512kB */
 #define	CONFIG_FIRMWARE_OFFSET		0x00200000
+#define	CONFIG_FIRMWARE_SIZE		0x00080000	/* 512kB  */
 #define	CONFIG_KERNEL_OFFSET		0x00300000
 #define	CONFIG_ROOTFS_OFFSET		0x00800000
 
@@ -155,7 +150,7 @@
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_PROMPT		"BIOS> "	/* prompt string */
 #define CONFIG_SYS_CBSIZE		2048		/* console I/O buffer */
-#define CONFIG_SYS_PBSIZE 		\
+#define CONFIG_SYS_PBSIZE		\
 				(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 						/* Print buffer size */
 #define CONFIG_SYS_MAXARGS		16		/* max command args */
@@ -165,22 +160,23 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER			/* enable the "hush" shell */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "	/* secondary prompt string */
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_PREBOOT			"run check_flash check_env;"
 
 /*
  * Boot Linux
  */
 #define CONFIG_CMDLINE_TAG		/* send commandline to Kernel	*/
-#define CONFIG_SETUP_MEMORY_TAGS 	/* send memory definition to kernel */
+#define CONFIG_SETUP_MEMORY_TAGS	/* send memory definition to kernel */
 #define CONFIG_INITRD_TAG		/* send initrd params	*/
 
-/* #define CONFIG_REVISION_TAG */
 #define CONFIG_OF_LIBFDT
 
 #define CONFIG_BOOTDELAY	1
 #define CONFIG_ZERO_BOOTDELAY_CHECK
-#define	CONFIG_BOOTFILE		MK_STR(CONFIG_BOARD_NAME) "-linux.bin"
-#define CONFIG_BOOTARGS 	"console=" MK_STR(ACFG_CONSOLE_DEV) "," \
-				MK_STR(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
+#define	CONFIG_BOOTFILE		__stringify(CONFIG_BOARD_NAME) "-linux.bin"
+#define CONFIG_BOOTARGS		"console=" __stringify(ACFG_CONSOLE_DEV) "," \
+			__stringify(CONFIG_BAUDRATE) " " MTDPARTS_DEFAULT \
 			" ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs "
 
 #define ACFG_CONSOLE_DEV	ttySMX0
@@ -191,58 +187,39 @@
  */
 #define CONFIG_LOADADDR			0xA0000000
 #define	CONFIG_SYS_LOAD_ADDR		CONFIG_LOADADDR
-#define CONFIG_SYS_TFTP_LOADADDR	CONFIG_LOADADDR
 
 /*
  * Extra Environments
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"env_version="		CONFIG_ENV_VERSION			"\0" \
-	"consoledev="		MK_STR(ACFG_CONSOLE_DEV)		"\0" \
+	"env_version="		__stringify(CONFIG_ENV_VERSION)		"\0" \
+	"consoledev="		__stringify(ACFG_CONSOLE_DEV)		"\0" \
 	"mtdparts="		MTDPARTS_DEFAULT			"\0" \
 	"partition=nand0,6\0"						\
-	"u-boot_addr="		MK_STR(CONFIG_SYS_MONITOR_OFFSET)	"\0" \
-	"env_addr="		MK_STR(CONFIG_ENV_OFFSET)		"\0" \
-	"firmware_addr="	MK_STR(CONFIG_FIRMWARE_OFFSET)		"\0" \
-	"kernel_addr="		MK_STR(CONFIG_KERNEL_OFFSET)		"\0" \
-	"rootfs_addr="		MK_STR(CONFIG_ROOTFS_OFFSET)		"\0" \
-	"board_name="		MK_STR(CONFIG_BOARD_NAME)		"\0" \
+	"u-boot_addr="		__stringify(CONFIG_SYS_MONITOR_OFFSET)	"\0" \
+	"env_addr="		__stringify(CONFIG_ENV_OFFSET)		"\0" \
+	"firmware_addr="	__stringify(CONFIG_FIRMWARE_OFFSET)	"\0" \
+	"firmware_size="	__stringify(CONFIG_FIRMWARE_SIZE)	"\0" \
+	"kernel_addr="		__stringify(CONFIG_KERNEL_OFFSET)	"\0" \
+	"rootfs_addr="		__stringify(CONFIG_ROOTFS_OFFSET)	"\0" \
+	"cpu_name=imx27"						"\0" \
+	"board_name="		__stringify(CONFIG_BOARD_NAME)		"\0" \
 	"kernel_addr_r=A0000000\0" \
 	"extrabootargs=otg_mode=device\0" 				\
-	"addnfsargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
-	"addubifsargs=setenv bootargs ${bootargs} "			\
-		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
-	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mmcblk0p1 rootfstype=ext2\0"   		\
-	"addipargs=setenv bootargs ${bootargs} "			\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
-		"${hostname}:eth0:off \0"				\
-	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
-		"nfs ${kernel_addr_r} "					\
-		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"nboot ${kernel_addr_r} kernel;"			\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\
-			" /boot/${board_name}-linux.bin;"		\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"boot_nfs_fallback_flash=if ping ${serverip};"			\
-			"then echo Boot over NFS; run nfsboot;"		\
-			"else echo Boot from the board; run ubifsboot;"	\
-		"fi\0"							\
-	"firmware_autoload=0\0"						\
+	"check_env=if test -n ${flash_env_version}; "			\
+		"then env default env_version; "			\
+		"else env set flash_env_version ${env_version}; env save; "\
+		"fi; "							\
+		"if itest ${flash_env_version} < ${env_version}; then " \
+			"echo \"*** Warning - Environment version"	\
+			" change suggests: run flash_reset_env; reset\"; "\
+			"env default flash_reset_env; "\
+		"fi; \0"						\
+	"check_flash=nand lock; nand unlock ${env_addr}; \0"	\
+	"flash_reset_env=env default -f -a; saveenv; run update_env;"	\
+		"echo Flash environment variables erased!\0"		\
+	"download_uboot=tftpboot ${loadaddr} ${board_name}"		\
+		"-u-boot-nand.bin\0"				\
 	"flash_uboot=nand unlock ${u-boot_addr} ;"			\
 		"nand erase.part u-boot;"		\
 		"if nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};"\
@@ -250,53 +227,26 @@
 				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
-	"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\0"							\
-	"flash_kernel=nand erase.part kernel;"				\
-		"if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
-			"then echo Flashing of kernel succeed;"		\
-			"else echo Flashing of kernel failed;"		\
-		"fi\0"							\
-	"flash_rootfs=nand erase.part rootfs;"	\
-		"if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
-			"then echo Flashing of rootfs succeed;"		\
-			"else echo Flashing of rootfs failed;"		\
-		"fi\0"							\
-	"flash_dtb=nand erase.part dtb;"				\
-		"if nand write.trimffs ${fileaddr} dtb ${filesize};"	\
-			"then echo Flashing of rootfs succeed;"		\
-			"else echo Flashing of rootfs failed;"		\
-		"fi\0"							\
-	"flash_reset_env=env default -f; saveenv;"			\
-		"echo Flash environment variables erased!\0"		\
-	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
-	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
-	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
-	"download_dtb=tftpboot ${loadaddr} imx27-${board_name}.dtb\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
-	"update_kernel=run download_kernel flash_kernel\0"		\
-	"update_rootfs=run download_rootfs flash_rootfs\0"		\
-	"update_dtb=run download_dtb flash_dtb\0"		\
-	"update_all=run download_kernel flash_kernel download_rootfs "	\
-		"flash_rootfs download_uboot flash_uboot\0"		\
+	"download_env=tftpboot ${loadaddr} ${board_name}"		\
+		"-u-boot-env.txt\0"				\
+	"flash_env=env import -t ${loadaddr}; env save; \0"		\
+	"update_env=run download_env flash_env\0"			\
+	"update_all=run update_env update_uboot\0"			\
 	"unlock_regs=mw 10000008 0; mw 10020008 0\0"			\
 
 /*
  * Serial Driver
  */
 #define CONFIG_MXC_UART
-#define CONFIG_SYS_MX27_UART1
 #define CONFIG_CONS_INDEX		1
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_BAUDRATE 		115200
 #define CONFIG_MXC_UART_BASE		UART1_BASE
 
 /*
  * GPIO
  */
+#define CONFIG_MXC_GPIO
 
 /*
  * NOR
@@ -313,7 +263,7 @@
 
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_SYS_NAND_LARGEPAGE
-#define IMX27_NAND_16BITS
+#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
 #define NAND_MAX_CHIPS			1
 
 #define CONFIG_SYS_DIRECT_FLASH_TFTP
@@ -341,22 +291,23 @@
  */
 #define CONFIG_FEC_MXC
 
-#define CONFIG_NET_MULTI
+/*#define CONFIG_PHYLIB
+#define CONFIG_PHY_SMSC*/
 #define CONFIG_FEC_MXC_PHYADDR		0x1f
-#define CONFIG_MII			1	/* MII PHY management	*/
+#define CONFIG_MII				/* MII PHY management	*/
 
 /*
  * FPGA
  */
-#define CONFIG_FPGA			CONFIG_SYS_SPARTAN3
+#define CONFIG_FPGA
 #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		250 /* 250 ms */
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_CHECK_CTRLC
 #define CONFIG_SYS_FPGA_CHECK_ERROR
-//#define CONFIG_SYS_FPGA_IS_PROTO /* to be defined with apf27 board prototype*/
+/*#define CONFIG_SYS_FPGA_IS_PROTO to be defined with apf27 board prototype*/
 
 /* FPGA program pin configuration */
 #define CONFIG_SYS_FPGA_PWR	(GPIO_PORTF | 19)	/* FPGA prog pin  */
@@ -386,14 +337,13 @@
  */
 
 #ifdef CONFIG_CMD_I2C
-#define	CONFIG_HARD_I2C			1
-
+#define	CONFIG_HARD_I2C
+#define CONFIG_I2C_MXC
+#define CONFIG_I2C_MULTI_BUS
+#define CONFIG_SYS_I2C_BASE		IMX_I2C1_BASE
 #define CONFIG_SYS_I2C_SPEED		100000	/* 100 kHz */
 #define CONFIG_SYS_I2C_SLAVE		0x7F
-
-#define CONFIG_I2C_CMD_TREE
-#define CONFIG_I2C_MULTI_BUS		2
-#define CONFIG_SYS_I2C_NOPROBES 	{ }
+#define CONFIG_SYS_I2C_NOPROBES		{ }
 
 #ifdef CONFIG_CMD_EEPROM
 # define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM 24LC02 */
@@ -404,10 +354,6 @@
 #endif /* CONFIG_CMD_I2C */
 
 /*
- * SPI
- */
-
-/*
  * SD/MMC
  */
 #ifdef CONFIG_CMD_MMC
@@ -426,14 +372,6 @@
 #endif /* CONFIG_CMD_DATE */
 
 /*
- * Watchdog Config
- */
-
-/*
- * USB
- */
-
-/*
  * Clocks
  */
 #define	CONFIG_SYS_HZ			1000	/* Ticks per second */
@@ -512,7 +450,7 @@
 /*
  * SDRAM
  */
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
+#if (ACFG_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
 /* micron 64MB */
 #define PHYS_SDRAM_1_SIZE			0x04000000 /* 64 MB */
 #define PHYS_SDRAM_2_SIZE			0x04000000 /* 64 MB */
@@ -535,7 +473,7 @@
 #define CONFIG_SYS_SDRAM_SINGLE_ACCESS		0  /* 1= single access; 0 = Burst mode */
 #endif
 
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 128)
+#if (ACFG_SDRAM_MBYTE_SYZE == 128)
 /* micron 128MB */
 #define PHYS_SDRAM_1_SIZE			0x08000000 /* 128 MB */
 #define PHYS_SDRAM_2_SIZE			0x08000000 /* 128 MB */
@@ -558,7 +496,7 @@
 #define CONFIG_SYS_SDRAM_SINGLE_ACCESS		0  /* 1= single access; 0 = Burst mode */
 #endif
 
-#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 256)
+#if (ACFG_SDRAM_MBYTE_SYZE == 256)
 /* micron 256MB */
 #define PHYS_SDRAM_1_SIZE			0x10000000 /* 256 MB */
 #define PHYS_SDRAM_2_SIZE			0x10000000 /* 256 MB */
@@ -808,8 +746,8 @@
 #define REG_FIELD_SCLIMX_VAL REG_FIELD_SCL_VAL
 #endif
 
-//#define REG_FIELD_SCL_VAL 3
-//#define REG_FIELD_SCLIMX_VAL 3
+/*#define REG_FIELD_SCL_VAL 3 */
+/*#define REG_FIELD_SCLIMX_VAL 3 */
 
 #if ((2*CONFIG_SYS_SDRAM_RC_DELAY)>(16*CONFIG_SYS_2XHCLK_LGTH))
 #define REG_FIELD_SRC_VAL 0


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-377-g7383dd4

From: jorasse <jo...@us...> - 2013-08-12 21:02:16

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  7383dd48f75c1a08e5788f14de05f4c50f9f2ba5 (commit)
      from  89ce23edf23b377362191bccdf49006b6e9158ae (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 7383dd48f75c1a08e5788f14de05f4c50f9f2ba5
Author: Philippe Reynes <tr...@ya...>
Date:   Mon Aug 12 18:21:44 2013 +0200

    [LINUX] 3.10: move to 3.10.6
    
    Signed-off-by: Philippe Reynes <tr...@ya...>

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

Summary of changes:
 ...nux-3.10.5.config => apf27-linux-3.10.6.config} |    0
 patches/linux/{3.10.5 => 3.10.6}                   |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.5.config => apf27-linux-3.10.6.config} (100%)
 rename patches/linux/{3.10.5 => 3.10.6} (100%)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.5.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.5.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.6.config
diff --git a/patches/linux/3.10.5 b/patches/linux/3.10.6
similarity index 100%
rename from patches/linux/3.10.5
rename to patches/linux/3.10.6


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-376-g89ce23e

From: jorasse <jo...@us...> - 2013-08-12 15:23: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  89ce23edf23b377362191bccdf49006b6e9158ae (commit)
      from  63dc53ce0c43ae77804f36636f8ad8931aa4e99d (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 89ce23edf23b377362191bccdf49006b6e9158ae
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Aug 12 17:33:12 2013 +0200

    [UBOOT] apf28: update to use external environment scripts.

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

Summary of changes:
 buildroot/configs/apf28_defconfig                  |    3 +
 buildroot/configs/apf28test_defconfig              |    3 +
 .../device/armadeus/apf28/apf28-u-boot-2013.04.h   |   96 ++++++--------------
 .../target/device/armadeus/u-boot-env-2013.04.txt  |    2 +-
 patches/u-boot/2013.04/502-add-apf28.patch         |   22 +----
 5 files changed, 39 insertions(+), 87 deletions(-)

diff --git a/buildroot/configs/apf28_defconfig b/buildroot/configs/apf28_defconfig
index 83dfdcf..e0ce2c3 100644
--- a/buildroot/configs/apf28_defconfig
+++ b/buildroot/configs/apf28_defconfig
@@ -84,6 +84,9 @@ 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_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.35.3"
diff --git a/buildroot/configs/apf28test_defconfig b/buildroot/configs/apf28test_defconfig
index 8022526..7fc29c4 100644
--- a/buildroot/configs/apf28test_defconfig
+++ b/buildroot/configs/apf28test_defconfig
@@ -110,6 +110,9 @@ 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_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(ARMADEUS_PATH)/u-boot-env-2013.04.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
 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-2013.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
index 1cb9d61..77de7f1 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2013.04.h
@@ -8,8 +8,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	"1.3"
-#define CONFIG_IDENT_STRING	" apf28 patch 1.3"
+#define CONFIG_ENV_VERSION	10
+#define CONFIG_IDENT_STRING	" apf28 patch 1.4"
 #define CONFIG_BOARD_NAME	apf28
 
 /*
@@ -25,7 +25,6 @@
  */
 #define CONFIG_SYS_NO_FLASH	/* to be define before <config_cmd_default.h>*/
 #define	CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_LATE_INIT
 #define	CONFIG_ARCH_MISC_INIT
 #define CONFIG_APBH_DMA
 
@@ -140,6 +139,7 @@
 /* last 2 MiB reservered for 2 copies of U-Boot */
 #define	CONFIG_SYS_MONITOR_OFFSET	0x00100000	/* offset in NAND */
 #define	CONFIG_SYS_MONITOR_LEN		0x00100000	/* 2 x 1MB */
+#define	CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_IS_IN_NAND
 #define	CONFIG_ENV_OFFSET		0x00300000	/* NAND offset */
 #define	CONFIG_ENV_SIZE			0x00020000	/* 128kB  */
@@ -177,6 +177,8 @@
 #define	CONFIG_AUTO_COMPLETE			/* Command auto complete */
 #define	CONFIG_CMDLINE_EDITING			/* Command history etc */
 #define	CONFIG_SYS_HUSH_PARSER			/* enable the "hush" shell */
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_PREBOOT			"run check_flash check_env;"
 
 /*
  * Boot Linux
@@ -208,45 +210,31 @@
  * Extra Environments
  */
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
-	"env_version="		CONFIG_ENV_VERSION "\0"			\
+	"env_version="		__stringify(CONFIG_ENV_VERSION)		"\0"\
 	"consoledev="		__stringify(ACFG_CONSOLE_DEV)		"\0"\
 	"mtdparts="		MTDPARTS_DEFAULT			"\0"\
 	"partition=nand0,6\0"						\
 	"u-boot_addr="		__stringify(CONFIG_SYS_MONITOR_OFFSET)	"\0"\
-	"u-boot_len="		__stringify(CONFIG_SYS_MONITOR_LEN)		"\0"\
-	"kernel_addr="		__stringify(CONFIG_KERNEL_OFFSET)		"\0"\
-	"rootfs_addr="		__stringify(CONFIG_ROOTFS_OFFSET)		"\0"\
+	"u-boot_len="		__stringify(CONFIG_SYS_MONITOR_LEN)	"\0"\
+	"env_addr="		__stringify(CONFIG_ENV_OFFSET)		"\0"\
+	"kernel_addr="		__stringify(CONFIG_KERNEL_OFFSET)	"\0"\
+	"rootfs_addr="		__stringify(CONFIG_ROOTFS_OFFSET)	"\0"\
+	"cpu_name=imx28"						"\0"\
 	"board_name="		__stringify(CONFIG_BOARD_NAME)		"\0"\
 	"kernel_addr_r=40000000\0" \
-	"addnfsargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
-	"addubifsargs=setenv bootargs ${bootargs} "			\
-		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
-	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mmcblk0p1 rootfstype=ext2\0"			\
-	"addipargs=setenv bootargs ${bootargs} "			\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
-		"${hostname}:eth0:off\0"				\
-	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
-		"nfs ${kernel_addr_r} "					\
-		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"nboot ${kernel_addr_r} kernel;"			\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\
-			" /boot/${board_name}-linux.bin;"		\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
+	"check_env=if test -n ${flash_env_version}; "			\
+		"then env default env_version; "			\
+		"else env set flash_env_version ${env_version}; env save; "\
+		"fi; "							\
+		"if itest ${flash_env_version} < ${env_version}; then " \
+			"echo \"*** Warning - Environment version"	\
+			" change suggests: run flash_reset_env; reset\"; "\
+			"env default flash_reset_env; "\
+		"fi; \0"						\
+	"check_flash= exit\0"						\
+	"flash_reset_env=env default -f -a; saveenv; run update_env;"	\
+		"echo Flash environment variables erased!\0"		\
+	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.sb\0"	\
 	"flash_uboot=if bcb nand.write ; then "				\
 		"nand erase ${u-boot_addr} ${u-boot_len} ; "		\
 		"nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};" \
@@ -256,34 +244,14 @@
 			"then echo Flashing of uboot succeed;"		\
 			"else echo Flashing of uboot failed;"		\
 		"fi; "							\
+		"else echo bcb update failed;;"				\
 		"fi; \0"						\
-	"flash_kernel=nand erase.part kernel;"				\
-		"if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
-			"then echo Flashing of kernel succeed;"		\
-			"else echo Flashing of kernel failed;"		\
-		"fi\0"							\
-	"flash_rootfs=nand erase.part rootfs;"				\
-		"if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
-			"then echo Flashing of rootfs succeed;"		\
-			"else echo Flashing of rootfs failed;"		\
-		"fi\0"							\
-	"flash_dtb=nand erase.part dtb;"				\
-		"if nand write.trimffs ${fileaddr} dtb ${filesize};"	\
-			"then echo Flashing of rootfs succeed;"		\
-			"else echo Flashing of rootfs failed;"		\
-		"fi\0"							\
-	"flash_reset_env=env default -f -a; saveenv;"			\
-		"echo Flash environment variables erased!\0"		\
-	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.sb\0"	\
-	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
-	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0"\
-	"download_dtb=tftpboot ${loadaddr} imx28-${board_name}.dtb\0"	\
 	"update_uboot=run download_uboot flash_uboot\0"			\
-	"update_kernel=run download_kernel flash_kernel\0"		\
-	"update_rootfs=run download_rootfs flash_rootfs\0"		\
-	"update_dtb=run download_dtb flash_dtb\0"			\
-	"update_all=run download_kernel flash_kernel download_rootfs "	\
-		"flash_rootfs download_uboot flash_uboot\0"		\
+	"download_env=tftpboot ${loadaddr} ${board_name}"		\
+		"-u-boot-env.txt\0"				\
+	"flash_env=env import -t ${loadaddr}; env save; \0"		\
+	"update_env=run download_env flash_env\0"			\
+	"update_all=run update_env update_uboot\0"			\
 	"unlock_regs=echo unlock_reg not needed anymore\0"
 
 /*
@@ -319,10 +287,6 @@
 #define CONFIG_FLASH_SHOW_PROGRESS	45
 #define CONFIG_SYS_NAND_QUIET		1
 
-/* Environment is in NAND */
-#define	CONFIG_ENV_IS_IN_NAND
-#define	CONFIG_ENV_OVERWRITE
-
 /*
  * Partitions & Filsystems
  */
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 d34227c..ce550d2 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 run load_firmware; fi;
+checknload_firmware=if test -n ${firmware_autoload}; then run load_firmware; else exit; fi;
 
 # DTB
 download_dtb=tftpboot ${loadaddr} ${cpu_name}-${board_name}.dtb
diff --git a/patches/u-boot/2013.04/502-add-apf28.patch b/patches/u-boot/2013.04/502-add-apf28.patch
index 112adfd..3bac862 100644
--- a/patches/u-boot/2013.04/502-add-apf28.patch
+++ b/patches/u-boot/2013.04/502-add-apf28.patch
@@ -75,11 +75,11 @@ new file mode 100644
 index 0000000..7f75494
 --- /dev/null
 +++ b/board/armadeus/apf28/apf28.c
-@@ -0,0 +1,194 @@
+@@ -0,0 +1,176 @@
 +/*
 + * APF28 motherboard based on DENX M28 module
 + *
-+ * Copyright (C) 2012 Eric Jarrige <eri...@ar...>
++ * Copyright (C) 2012-2013 Eric Jarrige <eri...@ar...>
 + * Copyright (C) 2011 Marek Vasut <mar...@gm...>
 + * on behalf of DENX Software Engineering GmbH
 + *
@@ -235,24 +235,6 @@ index 0000000..7f75494
 +	return ret;
 +}
 +
-+#ifdef CONFIG_BOARD_LATE_INIT
-+int board_late_init(void)
-+{
-+	char *s;
-+
-+	/* detect compatibility issue of environment version */
-+	s = getenv("env_version");
-+	if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
-+		char * const vars[] = {"flash_reset_env"};
-+		printf("*** Warning - Environment version change suggests: "
-+		       "run flash_reset_env; reset\n");
-+		set_default_vars(1, vars);
-+	}
-+
-+	return 0;
-+}
-+#endif
-+
 +#ifdef	CONFIG_MX28_FEC_MAC_IN_OCOTP
 +void mx28_adjust_mac(int dev_id, unsigned char *mac)
 +{


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-375-g63dc53c

From: Julien B a. A. <ar...@us...> - 2013-08-12 10:22:37

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  63dc53ce0c43ae77804f36636f8ad8931aa4e99d (commit)
      from  06953e1404bbf64b8f775b5edad872801e09b3fe (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 63dc53ce0c43ae77804f36636f8ad8931aa4e99d
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Aug 12 12:19:15 2013 +0200

    [BUILDROOT] Add patch to allow 3.10+ kernels compilation with uClibc 0.9.33.2

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

Summary of changes:
 ...penwrt-uclibc-add-kernel_long-declaration.patch |  374 ++++++++++++++++++++
 1 files changed, 374 insertions(+), 0 deletions(-)
 create mode 100644 patches/buildroot/2013.05/183-openwrt-uclibc-add-kernel_long-declaration.patch

diff --git a/patches/buildroot/2013.05/183-openwrt-uclibc-add-kernel_long-declaration.patch b/patches/buildroot/2013.05/183-openwrt-uclibc-add-kernel_long-declaration.patch
new file mode 100644
index 0000000..9656090
--- /dev/null
+++ b/patches/buildroot/2013.05/183-openwrt-uclibc-add-kernel_long-declaration.patch
@@ -0,0 +1,374 @@
+From OpenWRT.
+Until uClibc 0.9.33.3 is out.
+
+Index: buildroot/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-add___kernel_long_and___kernel_ulong.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/toolchain/uClibc/uClibc-0.9.33.2-OpenWRT-add___kernel_long_and___kernel_ulong.patch	2013-08-12 11:48:49.846207339 +0200
+@@ -0,0 +1,366 @@
++From 6a76edddaa62ff06f178143b582167734cb55c18 Mon Sep 17 00:00:00 2001
++From: Chris Packham <chr...@al...>
++Date: Mon, 01 Oct 2012 05:12:54 +0000
++Subject: libc/sysdeps: add __kernel_long and __kernel_ulong
++
++Linux 3.4 added __kernel_long_t and __kernel_ulong_t and various
++exported header files were updated to use these new types. Add the
++definitions for __kernel_long_t and __kernel_ulong_t to the relevant
++kernel_types.h headers.
++
++This change was automated with the following scriptlet
++
++  git grep --name-only 'typedef.*__kernel_old_dev_t' \
++    | xargs sed -i '/typedef.*__kernel_old_dev_t/ a\
++  typedef long\t\t__kernel_long_t;\
++  typedef unsigned long\t__kernel_ulong_t;'
++
++Whitespace in arm, avr32, hppa, sparc was then manually fixed up.
++
++Signed-off-by: Chris Packham <chr...@al...>
++--
++Here's a cleaned up patch which should get the whitespace right. I'm a
++bit iffy about the sparc changes they make sense to me but it's not a
++platform I have access to.
++
++I can break this up per arch or per maintainer if requested.
++
++ libc/sysdeps/linux/alpha/bits/kernel_types.h      |    2 ++
++ libc/sysdeps/linux/arm/bits/kernel_types.h        |    2 ++
++ libc/sysdeps/linux/avr32/bits/kernel_types.h      |    2 ++
++ libc/sysdeps/linux/bfin/bits/kernel_types.h       |    2 ++
++ libc/sysdeps/linux/c6x/bits/kernel_types.h        |    2 ++
++ libc/sysdeps/linux/cris/bits/kernel_types.h       |    2 ++
++ libc/sysdeps/linux/e1/bits/kernel_types.h         |    2 ++
++ libc/sysdeps/linux/h8300/bits/kernel_types.h      |    2 ++
++ libc/sysdeps/linux/hppa/bits/kernel_types.h       |    2 ++
++ libc/sysdeps/linux/i386/bits/kernel_types.h       |    2 ++
++ libc/sysdeps/linux/ia64/bits/kernel_types.h       |    2 ++
++ libc/sysdeps/linux/m68k/bits/kernel_types.h       |    2 ++
++ libc/sysdeps/linux/microblaze/bits/kernel_types.h |    2 ++
++ libc/sysdeps/linux/mips/bits/kernel_types.h       |    4 ++++
++ libc/sysdeps/linux/nios2/bits/kernel_types.h      |    2 ++
++ libc/sysdeps/linux/powerpc/bits/kernel_types.h    |    4 ++++
++ libc/sysdeps/linux/sh/bits/kernel_types.h         |    2 ++
++ libc/sysdeps/linux/sh64/bits/kernel_types.h       |    2 ++
++ libc/sysdeps/linux/sparc/bits/kernel_types.h      |    4 ++++
++ libc/sysdeps/linux/v850/bits/kernel_types.h       |    2 ++
++ libc/sysdeps/linux/x86_64/bits/kernel_types.h     |    2 ++
++ libc/sysdeps/linux/xtensa/bits/kernel_types.h     |    2 ++
++ 22 files changed, 50 insertions(+)
++Signed-off-by: Bernhard Reutner-Fischer <rep...@gm...>
++---
++diff --git a/libc/sysdeps/linux/alpha/bits/kernel_types.h b/libc/sysdeps/linux/alpha/bits/kernel_types.h
++index d5574c9..cd59b9d 100644
++--- a/libc/sysdeps/linux/alpha/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/alpha/bits/kernel_types.h
++@@ -33,6 +33,8 @@ typedef __kernel_gid_t __kernel_old_gid_t;
++ typedef __kernel_uid_t __kernel_uid32_t;
++ typedef __kernel_gid_t __kernel_gid32_t;
++ typedef __kernel_dev_t __kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ 
++ typedef struct {
++ 	int val[2];
++diff --git a/libc/sysdeps/linux/arm/bits/kernel_types.h b/libc/sysdeps/linux/arm/bits/kernel_types.h
++index 766a306..6b36f32 100644
++--- a/libc/sysdeps/linux/arm/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/arm/bits/kernel_types.h
++@@ -32,6 +32,8 @@ typedef unsigned short		__kernel_old_uid_t;
++ typedef unsigned short		__kernel_old_gid_t;
++ typedef long long		__kernel_loff_t;
++ typedef __kernel_dev_t		__kernel_old_dev_t;
+++typedef long			__kernel_long_t;
+++typedef unsigned long		__kernel_ulong_t;
++ 
++ typedef struct {
++ #ifdef __USE_ALL
++diff --git a/libc/sysdeps/linux/avr32/bits/kernel_types.h b/libc/sysdeps/linux/avr32/bits/kernel_types.h
++index f7d8b52..c551d57 100644
++--- a/libc/sysdeps/linux/avr32/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/avr32/bits/kernel_types.h
++@@ -39,6 +39,8 @@ typedef unsigned int		__kernel_gid32_t;
++ typedef unsigned short		__kernel_old_uid_t;
++ typedef unsigned short		__kernel_old_gid_t;
++ typedef unsigned short		__kernel_old_dev_t;
+++typedef long			__kernel_long_t;
+++typedef unsigned long		__kernel_ulong_t;
++ 
++ #ifdef __GNUC__
++ typedef long long		__kernel_loff_t;
++diff --git a/libc/sysdeps/linux/bfin/bits/kernel_types.h b/libc/sysdeps/linux/bfin/bits/kernel_types.h
++index d69a875..9fec595 100644
++--- a/libc/sysdeps/linux/bfin/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/bfin/bits/kernel_types.h
++@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
++ typedef unsigned short	__kernel_old_gid_t;
++ typedef long long	__kernel_loff_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ 
++ typedef struct {
++ #ifdef __USE_ALL
++diff --git a/libc/sysdeps/linux/c6x/bits/kernel_types.h b/libc/sysdeps/linux/c6x/bits/kernel_types.h
++index 7557309..2c363a8 100644
++--- a/libc/sysdeps/linux/c6x/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/c6x/bits/kernel_types.h
++@@ -22,6 +22,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned int	__kernel_old_uid_t;
++ typedef unsigned int	__kernel_old_gid_t;
++ typedef unsigned int	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef unsigned int	__kernel_size_t;
++ typedef int		__kernel_ssize_t;
++ typedef int		__kernel_ptrdiff_t;
++diff --git a/libc/sysdeps/linux/cris/bits/kernel_types.h b/libc/sysdeps/linux/cris/bits/kernel_types.h
++index f122c7f..5d31f7b 100644
++--- a/libc/sysdeps/linux/cris/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/cris/bits/kernel_types.h
++@@ -28,6 +28,8 @@ typedef unsigned int    __kernel_gid32_t;
++ typedef unsigned short  __kernel_old_uid_t;
++ typedef unsigned short  __kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ 
++ #ifdef __GNUC__
++ typedef long long	__kernel_loff_t;
++diff --git a/libc/sysdeps/linux/e1/bits/kernel_types.h b/libc/sysdeps/linux/e1/bits/kernel_types.h
++index 8017d85..f55a129 100644
++--- a/libc/sysdeps/linux/e1/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/e1/bits/kernel_types.h
++@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned short	__kernel_old_uid_t;
++ typedef unsigned short	__kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef long long	__kernel_loff_t;
++ 
++ /*
++diff --git a/libc/sysdeps/linux/h8300/bits/kernel_types.h b/libc/sysdeps/linux/h8300/bits/kernel_types.h
++index 0570675..4cfd1bf 100644
++--- a/libc/sysdeps/linux/h8300/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/h8300/bits/kernel_types.h
++@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
++ typedef unsigned short	__kernel_old_gid_t;
++ typedef long long	__kernel_loff_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ 
++ typedef struct {
++ #ifdef __USE_ALL
++diff --git a/libc/sysdeps/linux/hppa/bits/kernel_types.h b/libc/sysdeps/linux/hppa/bits/kernel_types.h
++index 4441f9b..6b2e794 100644
++--- a/libc/sysdeps/linux/hppa/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/hppa/bits/kernel_types.h
++@@ -45,6 +45,8 @@ typedef long long		__kernel_off64_t;
++ typedef unsigned long long	__kernel_ino64_t;
++ 
++ typedef unsigned int		__kernel_old_dev_t;
+++typedef long			__kernel_long_t;
+++typedef unsigned long		__kernel_ulong_t;
++ 
++ typedef struct {
++ #ifdef __USE_ALL
++diff --git a/libc/sysdeps/linux/i386/bits/kernel_types.h b/libc/sysdeps/linux/i386/bits/kernel_types.h
++index 9c07c72..59044b8 100644
++--- a/libc/sysdeps/linux/i386/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/i386/bits/kernel_types.h
++@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned short	__kernel_old_uid_t;
++ typedef unsigned short	__kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef long long	__kernel_loff_t;
++ 
++ typedef struct {
++diff --git a/libc/sysdeps/linux/ia64/bits/kernel_types.h b/libc/sysdeps/linux/ia64/bits/kernel_types.h
++index c8ef86d..e31dc65 100644
++--- a/libc/sysdeps/linux/ia64/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/ia64/bits/kernel_types.h
++@@ -52,5 +52,7 @@ typedef __kernel_gid_t __kernel_gid32_t;
++ 
++ typedef unsigned int	__kernel_dev_t;
++ typedef unsigned int	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ 
++ #endif /* _ASM_IA64_POSIX_TYPES_H */
++diff --git a/libc/sysdeps/linux/m68k/bits/kernel_types.h b/libc/sysdeps/linux/m68k/bits/kernel_types.h
++index 0a77a8f..176b968 100644
++--- a/libc/sysdeps/linux/m68k/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/m68k/bits/kernel_types.h
++@@ -32,6 +32,8 @@ typedef unsigned short	__kernel_old_uid_t;
++ typedef unsigned short	__kernel_old_gid_t;
++ typedef long long	__kernel_loff_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ 
++ typedef struct {
++ #ifdef __USE_ALL
++diff --git a/libc/sysdeps/linux/microblaze/bits/kernel_types.h b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
++index 2a70575..a9f736b 100644
++--- a/libc/sysdeps/linux/microblaze/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/microblaze/bits/kernel_types.h
++@@ -44,6 +44,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned int	__kernel_old_uid_t;
++ typedef unsigned int	__kernel_old_gid_t;
++ typedef unsigned int	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ 
++ #ifdef __GNUC__
++ typedef long long	__kernel_loff_t;
++diff --git a/libc/sysdeps/linux/mips/bits/kernel_types.h b/libc/sysdeps/linux/mips/bits/kernel_types.h
++index 9fc3b96..97faeac 100644
++--- a/libc/sysdeps/linux/mips/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/mips/bits/kernel_types.h
++@@ -32,6 +32,8 @@ typedef int		__kernel_gid32_t;
++ typedef __kernel_uid_t	__kernel_old_uid_t;
++ typedef __kernel_gid_t	__kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef long long      __kernel_loff_t;
++ #else
++ typedef unsigned int	__kernel_dev_t;
++@@ -68,6 +70,8 @@ typedef int		__kernel_gid32_t;
++ typedef __kernel_uid_t	__kernel_old_uid_t;
++ typedef __kernel_gid_t	__kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef long long      __kernel_loff_t;
++ #endif
++ 
++diff --git a/libc/sysdeps/linux/nios2/bits/kernel_types.h b/libc/sysdeps/linux/nios2/bits/kernel_types.h
++index 8b86d79..3c030e7 100644
++--- a/libc/sysdeps/linux/nios2/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/nios2/bits/kernel_types.h
++@@ -31,6 +31,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned short	__kernel_old_uid_t;
++ typedef unsigned short	__kernel_old_gid_t;
++ typedef unsigned short	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef long long	__kernel_loff_t;
++ 
++ typedef struct {
++diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_types.h b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
++index 3f3b933..1167de2 100644
++--- a/libc/sysdeps/linux/powerpc/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/powerpc/bits/kernel_types.h
++@@ -36,6 +36,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned int	__kernel_old_uid_t;
++ typedef unsigned int	__kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ #else
++ typedef unsigned int	__kernel_dev_t;
++ typedef unsigned int	__kernel_ino_t;
++@@ -61,6 +63,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned int	__kernel_old_uid_t;
++ typedef unsigned int	__kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef long long	__kernel_loff_t;
++ #endif
++ 
++diff --git a/libc/sysdeps/linux/sh/bits/kernel_types.h b/libc/sysdeps/linux/sh/bits/kernel_types.h
++index f96e9fa..ac97261 100644
++--- a/libc/sysdeps/linux/sh/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/sh/bits/kernel_types.h
++@@ -32,6 +32,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned short	__kernel_old_uid_t;
++ typedef unsigned short	__kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef long long	__kernel_loff_t;
++ 
++ typedef struct {
++diff --git a/libc/sysdeps/linux/sh64/bits/kernel_types.h b/libc/sysdeps/linux/sh64/bits/kernel_types.h
++index 671cc83..8cc6c61 100644
++--- a/libc/sysdeps/linux/sh64/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/sh64/bits/kernel_types.h
++@@ -43,6 +43,8 @@ typedef unsigned int    __kernel_gid32_t;
++ typedef unsigned short  __kernel_old_uid_t;
++ typedef unsigned short  __kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef long long       __kernel_loff_t;
++ 
++ typedef struct {
++diff --git a/libc/sysdeps/linux/sparc/bits/kernel_types.h b/libc/sysdeps/linux/sparc/bits/kernel_types.h
++index 0cc4bc2..a10e075 100644
++--- a/libc/sysdeps/linux/sparc/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/sparc/bits/kernel_types.h
++@@ -32,6 +32,8 @@ typedef unsigned short	       __kernel_gid16_t;
++ typedef __kernel_uid_t 	       __kernel_old_uid_t;
++ typedef __kernel_gid_t         __kernel_old_gid_t;
++ typedef __kernel_dev_t         __kernel_old_dev_t;
+++typedef long                   __kernel_long_t;
+++typedef unsigned long          __kernel_ulong_t;
++ typedef __kernel_uid_t	       __kernel_uid32_t;
++ typedef __kernel_gid_t	       __kernel_gid32_t;
++ typedef int		       __kernel_suseconds_t;
++@@ -62,6 +64,8 @@ typedef unsigned int	       __kernel_gid32_t;
++ typedef unsigned short	       __kernel_old_uid_t;
++ typedef unsigned short	       __kernel_old_gid_t;
++ typedef __kernel_dev_t         __kernel_old_dev_t;
+++typedef long                   __kernel_long_t;
+++typedef unsigned long          __kernel_ulong_t;
++ typedef long long              __kernel_loff_t;
++ #endif
++ 
++diff --git a/libc/sysdeps/linux/v850/bits/kernel_types.h b/libc/sysdeps/linux/v850/bits/kernel_types.h
++index 3e851ab..780aa8a 100644
++--- a/libc/sysdeps/linux/v850/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/v850/bits/kernel_types.h
++@@ -41,6 +41,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned short	__kernel_old_uid_t;
++ typedef unsigned short	__kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ 
++ typedef struct {
++ #ifdef __USE_ALL
++diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_types.h b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
++index de800d7..0cae08c 100644
++--- a/libc/sysdeps/linux/x86_64/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/x86_64/bits/kernel_types.h
++@@ -40,6 +40,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned short	__kernel_old_uid_t;
++ typedef unsigned short	__kernel_old_gid_t;
++ typedef __kernel_dev_t	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef long long	__kernel_loff_t;
++ 
++ typedef struct {
++diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_types.h b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
++index 44f1075..ed38f2e 100644
++--- a/libc/sysdeps/linux/xtensa/bits/kernel_types.h
+++++ b/libc/sysdeps/linux/xtensa/bits/kernel_types.h
++@@ -33,6 +33,8 @@ typedef unsigned int	__kernel_gid32_t;
++ typedef unsigned short	__kernel_old_uid_t;
++ typedef unsigned short	__kernel_old_gid_t;
++ typedef unsigned short	__kernel_old_dev_t;
+++typedef long		__kernel_long_t;
+++typedef unsigned long	__kernel_ulong_t;
++ typedef long long	__kernel_loff_t;
++ 
++ /* Beginning in 2.6 kernels, which is the first version that includes the
++--
++cgit v0.9.0.1-2-gef13


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-374-g06953e1

From: jorasse <jo...@us...> - 2013-08-12 09:29:06

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  06953e1404bbf64b8f775b5edad872801e09b3fe (commit)
      from  c4e7d139f38c0bc9c92dfb05da4ae628f938804e (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 06953e1404bbf64b8f775b5edad872801e09b3fe
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Aug 12 11:38:29 2013 +0200

    [UBOOT] apf27: FPGA cleanup

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2013.04.h   |    4 ++--
 1 files changed, 2 insertions(+), 2 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 888bb5d..f0de2c8 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
@@ -300,11 +300,11 @@
 /*
  * FPGA
  */
-#define CONFIG_FPGA			CONFIG_SYS_SPARTAN3
+#define CONFIG_FPGA
 #define CONFIG_FPGA_COUNT		1
 #define CONFIG_FPGA_XILINX
 #define CONFIG_FPGA_SPARTAN3
-#define CONFIG_SYS_FPGA_WAIT		1000 /* 1 s */
+#define CONFIG_SYS_FPGA_WAIT		250 /* 250ms */
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_CHECK_CTRLC
 #define CONFIG_SYS_FPGA_CHECK_ERROR


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-373-gc4e7d13

From: jorasse <jo...@us...> - 2013-08-12 09:23:07

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  c4e7d139f38c0bc9c92dfb05da4ae628f938804e (commit)
      from  9d74432d5b909ac176b5a3e563400717535eb71a (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 c4e7d139f38c0bc9c92dfb05da4ae628f938804e
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Aug 12 11:32:34 2013 +0200

    [UBOOT] apf51: FPGA cleanup

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2013.04.h   |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
index 35717c5..d36a431 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
@@ -323,11 +323,11 @@
 /*
  * FPGA
  */
-#define CONFIG_FPGA			CONFIG_SYS_SPARTAN3
+#define CONFIG_FPGA
 #define CONFIG_FPGA_COUNT		1
 #define CONFIG_FPGA_XILINX
 #define CONFIG_FPGA_SPARTAN3
-#define CONFIG_SYS_FPGA_WAIT		1000	/* 1 s */
+#define CONFIG_SYS_FPGA_WAIT		250	/* 250ms */
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_CHECK_CTRLC
 #define CONFIG_SYS_FPGA_CHECK_ERROR


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-372-g9d74432

From: jorasse <jo...@us...> - 2013-08-12 09:15:01

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  9d74432d5b909ac176b5a3e563400717535eb71a (commit)
      from  bcc0d5494e1cc6aca6b5da4b69e4bb1afb56619e (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 9d74432d5b909ac176b5a3e563400717535eb71a
Author: Eric Jarrige <eri...@ar...>
Date:   Mon Aug 12 11:24:01 2013 +0200

    [UBOOT] apf9328: update to use external environment scripts.

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

Summary of changes:
 buildroot/configs/apf9328_defconfig                |    3 +
 buildroot/configs/apf9328test_defconfig            |    3 +
 .../armadeus/apf9328/apf9328-u-boot-2013.04.h      |   97 +++++++-------------
 .../apf9328/apf9328-u-boot-env-2013.04.txt         |   34 +++++++
 patches/u-boot/2013.04/103-apf9328.patch           |   84 ++++++-----------
 5 files changed, 104 insertions(+), 117 deletions(-)
 create mode 100644 buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt

diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index 71e41dc..c9686e4 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -67,6 +67,9 @@ 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_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-env-2013.04.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
diff --git a/buildroot/configs/apf9328test_defconfig b/buildroot/configs/apf9328test_defconfig
index 1a99ed6..1e7341f 100644
--- a/buildroot/configs/apf9328test_defconfig
+++ b/buildroot/configs/apf9328test_defconfig
@@ -112,6 +112,9 @@ 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_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-env-2013.04.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x20000"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.29.6"
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
index d75c8a4..bad6229 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2013.04.h
@@ -8,8 +8,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	"5.4"
-#define CONFIG_IDENT_STRING	" apf9328 patch 5.8"
+#define CONFIG_ENV_VERSION	10
+#define CONFIG_IDENT_STRING	" apf9328 patch 5.9"
 #define CONFIG_BOARD_NAME	apf9328
 
 /*
@@ -23,7 +23,6 @@
  * Enable the call to miscellaneous platform dependent initialization.
  */
 #define CONFIG_SYS_DCACHE_OFF
-#define CONFIG_MISC_INIT_R
 
 /*
  * Board display option
@@ -107,7 +106,7 @@
 		(CONFIG_ENV_ADDR + CONFIG_ENV_SIZE)	/* +128kB */
 #define	CONFIG_ENV_SIZE_REDUND	CONFIG_ENV_SIZE	/* 128kB */
 #define	CONFIG_FIRMWARE_ADDR	0x10080000
-#define	CONFIG_FIRMWARE_LEN	0x00040000	/* 256kB ( 2 flash sector ) */
+#define	CONFIG_FIRMWARE_SIZE	0x00040000	/* 256kB ( 2 flash sector ) */
 #define	CONFIG_KERNEL_ADDR	0x100C0000
 #define	CONFIG_ROOTFS_ADDR	0x102C0000
 
@@ -139,6 +138,8 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER			/* enable the "hush" shell */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "	/* secondary prompt string */
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_PREBOOT			"run check_flash check_env;"
 
 /*
  * Boot Linux
@@ -170,36 +171,31 @@
  * Extra Environments
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"env_version="		CONFIG_ENV_VERSION		"\0"	\
-	"consoledev="		__stringify(ACFG_CONSOLE_DEV)	"\0"	\
-	"mtdparts="		MTDPARTS_DEFAULT		"\0"	\
+	"env_version="		__stringify(CONFIG_ENV_VERSION)		"\0" \
+	"consoledev="		__stringify(ACFG_CONSOLE_DEV)		"\0" \
+	"mtdparts="		MTDPARTS_DEFAULT			"\0" \
 	"partition=nor0,5\0"						\
-	"uboot_addr="		__stringify(CONFIG_SYS_MONITOR_BASE)	"\0"	\
-	"firmware_addr="	__stringify(CONFIG_FIRMWARE_ADDR)	"\0"	\
-	"kernel_addr="		__stringify(CONFIG_KERNEL_ADDR)	"\0"	\
-	"rootfs_addr="		__stringify(CONFIG_ROOTFS_ADDR)	"\0"	\
+	"uboot_addr="		__stringify(CONFIG_SYS_MONITOR_BASE)	"\0" \
+	"env_addr="		__stringify(CONFIG_ENV_ADDR)		"\0" \
+	"firmware_addr="	__stringify(CONFIG_FIRMWARE_ADDR)	"\0" \
+	"firmware_size="	__stringify(CONFIG_FIRMWARE_SIZE)	"\0" \
+	"kernel_addr="		__stringify(CONFIG_KERNEL_ADDR)		"\0" \
+	"rootfs_addr="		__stringify(CONFIG_ROOTFS_ADDR)		"\0" \
+	"cpu_name=imx1"							"\0" \
 	"board_name="		__stringify(CONFIG_BOARD_NAME)	"\0"	\
-	"firmware_autoload=0\0"						\
-	"addnfsargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"	\
-	"addjffsargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mtdblock5 rootfstype=jffs2\0"		\
-	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mmcblk0p1 rootfstype=ext2\0"			\
-	"addipargs=setenv bootargs ${bootargs} "			\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
-		"${hostname}:eth0:off \0"				\
-	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs; "\
-		"nfs ${loadaddr} "					\
-		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
-		"bootm ${loadaddr}\0"					\
-	"jffsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addjffsargs addipargs; "\
-		"bootm ${kernel_addr}\0"				\
-	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs; "\
-		"bootm ${kernel_addr}\0"				\
+	"check_env=if test -n ${flash_env_version}; "			\
+		"then env default env_version; "			\
+		"else env set flash_env_version ${env_version}; env save; "\
+		"fi; "							\
+		"if itest ${flash_env_version} < ${env_version}; then " \
+			"echo \"*** Warning - Environment version"	\
+			" change suggests: run flash_reset_env; reset\"; "\
+			"env default flash_reset_env; "			\
+		"fi; \0"						\
+	"check_flash=protect on nor0,0;\0"		\
+	"flash_reset_env=env default -f -a; saveenv; run update_env;"	\
+		"echo Flash environment variables erased!\0"		\
+	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.bin\0"\
 	"flash_uboot=protect off nor0,0;"				\
 		"echo Erasing FLASH;"					\
 		"era nor0,0;"						\
@@ -208,34 +204,12 @@
 				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
-	"flash_firmware=echo Erasing FLASH;"				\
-		"era nor0,3;"						\
-		"if cp.b ${fileaddr} ${firmware_addr} ${filesize} ;"	\
-			"then echo Flashing of Firmware succeed;"	\
-			"else echo Flashing of Firmware failed;"	\
-		"fi\0"							\
-	"flash_kernel=echo Erasing FLASH;"				\
-		"era nor0,4;"						\
-		"if cp.b ${fileaddr} ${kernel_addr} ${filesize} ;"	\
-			"then echo Flashing of kernel succeed;"		\
-			"else echo Flashing of kernel failed;"		\
-		"fi\0"							\
-	"flash_rootfs=echo Erasing FLASH;"				\
-		"era nor0,5;"						\
-		"if cp.b ${fileaddr} ${rootfs_addr} ${filesize};"	\
-			"then echo Flashing of rootfs succeed;"		\
-			"else echo Flashing of rootfs failed;"		\
-		"fi\0"							\
-	"flash_reset_env=env default -f -a; saveenv;"			\
-		"echo Flash environment variables erased!\0"		\
-	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot.bin\0"\
-	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0"\
-	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.jffs2\0"\
 	"update_uboot=run download_uboot flash_uboot\0"			\
-	"update_kernel=run download_kernel flash_kernel\0"		\
-	"update_rootfs=run download_rootfs flash_rootfs\0"		\
-	"update_all=run download_kernel flash_kernel download_rootfs "	\
-		"flash_rootfs download_uboot flash_uboot\0"		\
+	"download_env=tftpboot ${loadaddr} ${board_name}"		\
+		"-u-boot-env.txt\0"					\
+	"flash_env=env import -t ${loadaddr}; env save; \0"		\
+	"update_env=run download_env flash_env\0"			\
+	"update_all=run update_env update_uboot\0"			\
 	"unlock_regs=mw 00200008 0; mw 00210008 0\0"			\
 
 /*
@@ -284,12 +258,11 @@
 /*
  * FPGA
  */
+#define CONFIG_FPGA
 #define CONFIG_FPGA_COUNT	1
-/* only digital value for CONFIG_FPGA is supported (investigation pending) */
-#define CONFIG_FPGA		0x801	/* CONFIG_SYS_XILINX_SPARTAN3 */
 #define CONFIG_FPGA_XILINX
 #define CONFIG_FPGA_SPARTAN3
-#define CONFIG_SYS_FPGA_WAIT		250
+#define CONFIG_SYS_FPGA_WAIT		250	/* 250 ms */
 #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/apf9328/apf9328-u-boot-env-2013.04.txt b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
new file mode 100644
index 0000000..913bf2b
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-env-2013.04.txt
@@ -0,0 +1,34 @@
+# U-Boot / environment variable management scripts
+# FPGA
+download_firmware=tftpboot ${loadaddr} ${board_name}-firmware.bin
+flash_firmware=echo Erasing FLASH;era nor0,3;if cp.b ${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=fpga loadb 0 ${firmware_addr} ${firmware_size} || fpga load 0 ${firmware_addr} ${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 run load_firmware; fi;
+
+# DTB
+
+# kernel
+download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin
+flash_kernel=echo Erasing FLASH;era nor0,4;if cp.b ${fileaddr} ${kernel_addr} ${filesize} ;then echo Flashing of kernel succeed;else echo Flashing of kernel failed;fi
+update_kernel=run download_kernel flash_kernel
+
+# rootfs
+download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.jffs2
+flash_rootfs=echo Erasing FLASH;era nor0,5;if cp.b ${fileaddr} ${rootfs_addr} ${filesize};then echo Flashing of rootfs succeed;else echo Flashing of rootfs failed;fi
+update_rootfs=run download_rootfs flash_rootfs
+
+# update
+update_all=run update_kernel update_rootfs update_env update_uboot
+
+# boot
+addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off
+addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 rootfstype=ext2
+mmcboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addmmcargs addipargs; bootm ${kernel_addr}
+addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw nfsroot=${serverip}:${rootpath}
+nfsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addnfsargs addipargs; nfs ${loadaddr} ${serverip}:${rootpath}/boot/${board_name}-linux.bin;bootm ${loadaddr}
+addjffsargs=setenv bootargs ${bootargs} root=/dev/mtdblock5 rootfstype=jffs2
+jffsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addjffsargs addipargs; bootm ${kernel_addr}
+
+preboot=run check_flash checknload_firmware check_env ;
+
diff --git a/patches/u-boot/2013.04/103-apf9328.patch b/patches/u-boot/2013.04/103-apf9328.patch
index 36f302a..7f1b021 100644
--- a/patches/u-boot/2013.04/103-apf9328.patch
+++ b/patches/u-boot/2013.04/103-apf9328.patch
@@ -89,7 +89,7 @@ new file mode 100644
 index 0000000..280f749
 --- /dev/null
 +++ b/board/armadeus/apf9328/apf9328.c
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,74 @@
 +/*
 + * (C) Copyright 2005-2011
 + * Nicolas Colombain <nic...@ar...>
@@ -126,6 +126,14 @@ index 0000000..280f749
 +
 +	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 +
++#ifdef CONFIG_DRIVER_DM9000
++	imx_gpio_mode(GPIO_PORTB | GPIO_DR | GPIO_IN | 14);
++#endif
++
++#ifdef CONFIG_FPGA
++	apf9328_init_fpga();
++#endif
++
 +	return 0;
 +}
 +
@@ -145,33 +153,6 @@ index 0000000..280f749
 +#endif
 +}
 +
-+/*
-+ * Miscellaneous intialization
-+ */
-+int misc_init_r(void)
-+{
-+	char *s;
-+
-+#ifdef CONFIG_FPGA
-+	apf9328_init_fpga();
-+#endif
-+
-+#ifdef CONFIG_DRIVER_DM9000
-+	imx_gpio_mode(GPIO_PORTB | GPIO_DR | GPIO_IN | 14);
-+#endif
-+
-+	/* detect compatibility issue of environment version */
-+	s = getenv("env_version");
-+	if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
-+		char * const vars[] = {"flash_reset_env"};
-+		printf("*** Warning - Environment version change suggests: "
-+		       "run flash_reset_env; reset\n");
-+		set_default_vars(1, vars);
-+	}
-+
-+	return 0;
-+}
-+
 +void show_boot_progress(int status)
 +{
 +	return;
@@ -188,7 +169,7 @@ new file mode 100644
 index 0000000..9782115
 --- /dev/null
 +++ b/board/armadeus/apf9328/apf9328fpga.c
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,81 @@
 +/*
 + * (C) Copyright 2005-2011
 + * Nicolas Colombain <nic...@ar...>
@@ -240,6 +221,9 @@ index 0000000..9782115
 +	fpga_init_fn,
 +	fpga_done_fn,
 +	fpga_wr_fn,
++	fpga_post_fn,
++	NULL,
++	fpga_abort_fn,
 +};
 +
 +Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
@@ -255,37 +239,15 @@ index 0000000..9782115
 + */
 +int apf9328_init_fpga(void)
 +{
-+	char *autoload = getenv("firmware_autoload");
-+	int i, lout = 1;
-+	u8 pnum;
-+	struct mtd_device *dev;
-+	struct part_info *part;
-+
-+	debug("%s:%d: Initialize FPGA interface (relocation offset= 0x%.8lx)\n",
-+		__func__, __LINE__, gd->reloc_off);
++	int i;
 +
 +	fpga_init();
 +
 +	for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
-+		debug("%s:%d: Adding fpga %d\n", __func__, __LINE__, i);
 +		fpga_add(fpga_xilinx, &fpga[i]);
 +	}
 +
-+	if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+		if ((mtdparts_init() == 0) &&
-+		(find_dev_and_part("firmware", &dev, &pnum, &part) == 0)) {
-+			if (ctrlc()) {
-+				printf("Firmware download stopped!\n");
-+				lout = 0;
-+			} else if (FPGA_SUCCESS != fpga_load(0,
-+							(void *)part->offset,
-+							(size_t)part->size)) {
-+				lout = 0;
-+				printf("Firmware not loaded!\n");
-+			}
-+		}
-+	}
-+	return lout;
++	return 0;
 +}
 +
 +#endif /* CONFIG_FPGA */
@@ -425,7 +387,7 @@ new file mode 100644
 index 0000000..f3d4f03
 --- /dev/null
 +++ b/board/armadeus/apf9328/fpga.c
-@@ -0,0 +1,121 @@
+@@ -0,0 +1,131 @@
 +/*
 + * (C) Copyright 2002
 + * Rich Ireland, Enterasys Networks, rir...@en....
@@ -546,13 +508,23 @@ index 0000000..f3d4f03
 +	return assert_write;
 +}
 +
++int fpga_post_fn(int cookie)
++{
++	return cookie;
++}
++
++int fpga_abort_fn(int cookie)
++{
++	return fpga_post_fn(cookie);
++}
++
 +#endif /* CONFIG_FPGA */
 diff --git a/board/armadeus/apf9328/fpga.h b/board/armadeus/apf9328/fpga.h
 new file mode 100644
 index 0000000..3b226d7
 --- /dev/null
 +++ b/board/armadeus/apf9328/fpga.h
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,32 @@
 +/*
 + * (C) Copyright 2002
 + * Rich Ireland, Enterasys Networks, rir...@en....
@@ -583,6 +555,8 @@ index 0000000..3b226d7
 +extern int fpga_done_fn(int cookie);
 +extern int fpga_clk_fn(int assert_clk, int flush, int cookie);
 +extern int fpga_wr_fn(int assert_write, int flush, int cookie);
++extern int fpga_post_fn(int cookie);
++extern int fpga_abort_fn(int cookie);
 diff --git a/board/armadeus/apf9328/i2c.c b/board/armadeus/apf9328/i2c.c
 new file mode 100644
 index 0000000..0ba0a8d


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-371-gbcc0d54

From: jorasse <jo...@us...> - 2013-08-09 17:47:12

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  bcc0d5494e1cc6aca6b5da4b69e4bb1afb56619e (commit)
      from  4436ec3daf9863334b4e9a3f66737a1ec530907d (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 bcc0d5494e1cc6aca6b5da4b69e4bb1afb56619e
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Aug 9 19:56:26 2013 +0200

    [UBOOT] apf27: Fix FPGA state after abort action

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

Summary of changes:
 ...pf27-Add-FPGA-support-for-the-apf27-board.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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 d7fa176..edfcaf2 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
@@ -235,7 +235,7 @@ index 0000000..47f4ffc
 +
 +int fpga_abort_fn(int cookie)
 +{
-+	return cookie;
++	return fpga_post_fn(cookie);
 +}
 +
 +


hooks/post-receive
-- 
armadeus

[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

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-369-gee6dedf

From: jorasse <jo...@us...> - 2013-08-09 16:00: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  ee6dedf7bc30460b58eccb930ad62721a09a138a (commit)
      from  d79da81bcafc3808681495b4369acae09f07f940 (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 ee6dedf7bc30460b58eccb930ad62721a09a138a
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Aug 9 18:10:12 2013 +0200

    [UBOOT] apf51: update to use external environment scripts.

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

Summary of changes:
 .../device/armadeus/apf51/apf51-u-boot-2013.04.h   |  106 ++++++--------------
 .../target/device/armadeus/u-boot-env-2013.04.txt  |    2 +-
 patches/u-boot/2013.04/401-apf51.patch             |   73 ++------------
 3 files changed, 42 insertions(+), 139 deletions(-)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
index 31f7aa5..35717c5 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2013.04.h
@@ -8,8 +8,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	"1.5"
-#define CONFIG_IDENT_STRING	" apf51 patch 2.1"
+#define CONFIG_ENV_VERSION	10
+#define CONFIG_IDENT_STRING	" apf51 patch 2.2"
 #define CONFIG_BOARD_NAME apf51
 
 /*
@@ -24,8 +24,6 @@
  */
 #define CONFIG_SYS_NO_FLASH	/* to be define before <config_cmd_default.h> */
 #define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_MISC_INIT_R
-#define CONFIG_BOARD_LATE_INIT
 
 /*
  * Board display option
@@ -136,8 +134,9 @@
 #define CONFIG_ENV_RANGE		0x00080000	/* 512kB */
 #define	CONFIG_ENV_OFFSET_REDUND	\
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)	/* +512kB */
-#define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE	/* 512kB */
+#define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE	/* 128kB */
 #define	CONFIG_FIRMWARE_OFFSET		0x00200000
+#define	CONFIG_FIRMWARE_SIZE		0x00100000
 #define	CONFIG_KERNEL_OFFSET		0x00400000
 #define	CONFIG_ROOTFS_OFFSET		0x00C00000
 
@@ -169,6 +168,8 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER			/* enable the "hush" shell */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "	/* secondary prompt string */
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_PREBOOT			"run check_flash check_env;"
 
 /*
  * Boot Linux
@@ -200,47 +201,34 @@
  * Extra Environments
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"env_version="		CONFIG_ENV_VERSION			"\0" \
+	"env_version="		__stringify(CONFIG_ENV_VERSION)		"\0" \
 	"consoledev="		__stringify(ACFG_CONSOLE_DEV)		"\0" \
 	"mtdparts="		MTDPARTS_DEFAULT			"\0" \
 	"partition=nand0,7\0"						\
 	"uboot_addr="		__stringify(CONFIG_SYS_MONITOR_OFFSET)	"\0" \
 	"env_addr="		__stringify(CONFIG_ENV_OFFSET)		"\0" \
-	"firmware_addr="	__stringify(CONFIG_FIRMWARE_OFFSET)		"\0" \
-	"kernel_addr="		__stringify(CONFIG_KERNEL_OFFSET)		"\0" \
-	"rootfs_addr="		__stringify(CONFIG_ROOTFS_OFFSET)		"\0" \
+	"firmware_addr="	__stringify(CONFIG_FIRMWARE_OFFSET)	"\0" \
+	"firmware_size="	__stringify(CONFIG_FIRMWARE_SIZE)	"\0" \
+	"kernel_addr="		__stringify(CONFIG_KERNEL_OFFSET)	"\0" \
+	"rootfs_addr="		__stringify(CONFIG_ROOTFS_OFFSET)	"\0" \
+	"cpu_name=imx51"						"\0" \
 	"board_name="		__stringify(CONFIG_BOARD_NAME)		"\0" \
 	"kernel_addr_r=90800000\0" \
-	"addnfsargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
-	"addubifsargs=setenv bootargs ${bootargs} "			\
-		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
-	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mmcblk0p1 rootfstype=ext2\0"			\
-	"addipargs=setenv bootargs ${bootargs} "			\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
-		"${hostname}:eth0:off\0"				\
-	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
-		"nfs ${kernel_addr_r} "					\
-		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"nboot ${kernel_addr_r} kernel;"			\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\
-			" /boot/${board_name}-linux.bin;"		\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"firmware_autoload=0\0"						\
+	"preboot=run check_flash check_env; \0"					\
+	"check_env=if test -n ${flash_env_version}; "			\
+		"then env default env_version; "			\
+		"else env set flash_env_version ${env_version}; env save; "\
+		"fi; "							\
+		"if itest ${flash_env_version} < ${env_version}; then " \
+			"echo \"*** Warning - Environment version"	\
+			" change suggests: run flash_reset_env; reset\"; "\
+			"env default flash_reset_env; "\
+		"fi; \0"						\
+	"check_flash=nand lock; nand unlock ${env_addr}; \0"	\
+	"flash_reset_env=env default -f -a; saveenv; run update_env;"	\
+		"echo Flash environment variables erased!\0"		\
+	"download_uboot=tftpboot ${loadaddr} ${board_name}"		\
+		"-u-boot-with-nand-spl.imx\0"				\
 	"flash_uboot=nand unlock ${uboot_addr} ;"			\
 		"nand erase.part u-boot;"				\
 		"if nand write.trimffs ${fileaddr} ${uboot_addr} ${filesize};"\
@@ -248,40 +236,12 @@
 				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
-	"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\0"							\
-	"flash_kernel=nand erase.part kernel;"	\
-		"if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
-			"then echo Flashing of kernel succeed;"		\
-			"else echo Flashing of kernel failed;"		\
-		"fi\0"							\
-	"flash_rootfs=nand erase.part rootfs;"	\
-		"if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
-			"then echo Flashing of rootfs succeed;"		\
-			"else echo Flashing of rootfs failed;"		\
-		"fi\0"							\
-	"flash_dtb=nand erase.part dtb;"				\
-		"if nand write.trimffs ${fileaddr} dtb ${filesize};"	\
-			"then echo Flashing of rootfs succeed;"		\
-			"else echo Flashing of rootfs failed;"		\
-		"fi\0"							\
-	"flash_reset_env=env default -f -a; saveenv;"			\
-		"echo Flash environment variables erased!\0"		\
-	"download_uboot=tftpboot ${loadaddr} ${board_name}"		\
-		"-u-boot-with-nand-spl.imx\0"				\
-	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
-	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
-	"download_dtb=tftpboot ${loadaddr} imx51-${board_name}.dtb\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
-	"update_kernel=run download_kernel flash_kernel\0"		\
-	"update_rootfs=run download_rootfs flash_rootfs\0"		\
-	"update_dtb=run download_dtb flash_dtb\0"			\
-	"update_all=run download_kernel flash_kernel download_rootfs "	\
-		"flash_rootfs download_uboot flash_uboot\0"		\
+	"download_env=tftpboot ${loadaddr} ${board_name}"		\
+		"-u-boot-env.txt\0"				\
+	"flash_env=env import -t ${loadaddr}; env save; \0"		\
+	"update_env=run download_env flash_env\0"			\
+	"update_all=run update_env update_uboot\0"			\
 	"unlock_regs=echo unlock_reg not needed anymore\0"
 
 /*
@@ -367,7 +327,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 db77f1c..0290499 100644
--- a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
@@ -3,7 +3,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 loadb 0 ${loadaddr} ${firmware_size}; if test $? -eq 0; then echo Firmware successfully loaded; else echo Loading firmware failed! fi;
+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;
 
 # DTB
diff --git a/patches/u-boot/2013.04/401-apf51.patch b/patches/u-boot/2013.04/401-apf51.patch
index 66a5455..4f72a79 100644
--- a/patches/u-boot/2013.04/401-apf51.patch
+++ b/patches/u-boot/2013.04/401-apf51.patch
@@ -67,7 +67,7 @@ new file mode 100644
 index 0000000..8ff1381
 --- /dev/null
 +++ b/board/armadeus/apf51/apf51.c
-@@ -0,0 +1,1204 @@
+@@ -0,0 +1,1157 @@
 +/*
 + * (C) Copyright 2010-2013 Eric Jarrige, Armadeus Project
 + *
@@ -986,62 +986,15 @@ index 0000000..8ff1381
 +	/* address of boot parameters */
 +	gd->bd->bi_boot_params = CSD0_BASE_ADDR + 0x100;
 +
-+	return 0;
-+}
-+
-+/*
-+ * Miscellaneous intialization
-+ */
-+int misc_init_r(void)
-+{
 +#ifdef CONFIG_I2C_MXC
 +	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 +#endif
-+	return 0;
-+}
-+
-+#ifdef CONFIG_BOARD_LATE_INIT
-+int board_late_init(void)
-+{
-+	char *s;
-+	u_char *firmware_buffer =
-+	    (u_char *) (CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
-+	size_t size = 0;
-+	char *autoload = getenv("firmware_autoload");
-+	u8 pnum;
-+	struct mtd_device *dev;
-+	struct part_info *part;
 +
 +#if defined(CONFIG_FPGA)
-+	/* init and download fpga */
-+	if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+		if ((mtdparts_init() == 0) && (find_dev_and_part("firmware",
-+			&dev, &pnum, &part) == 0)) {
-+			size = part->size;
-+			if (nand_read_skip_bad(&nand_info[0], part->offset,
-+				&size, NULL, nand_info[0].size, firmware_buffer))
-+				size = 0;
-+		}
-+		if (ctrlc()) {
-+			printf("Firmware download stopped!\n");
-+			size = 0;
-+		}
-+	}
-+	APF51_init_fpga(firmware_buffer, size);
++	APF51_init_fpga();
 +#endif
-+
-+	/* detect compatibility issue of environment version */
-+	s = getenv("env_version");
-+	if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
-+		char * const vars[] = {"flash_reset_env"};
-+		printf("*** Warning - Environment version change suggests: "
-+		       "run flash_reset_env; reset\n");
-+		set_default_vars(1, vars);
-+	}
-+
 +	return 0;
 +}
-+#endif
 +
 +int checkboard(void)
 +{
@@ -1277,7 +1230,7 @@ new file mode 100644
 index 0000000..665928e
 --- /dev/null
 +++ b/board/armadeus/apf51/fpga.c
-@@ -0,0 +1,266 @@
+@@ -0,0 +1,256 @@
 +/*
 + * (C) Copyright 2002-2010
 + * Nicolas Colombain <nic...@ar...>
@@ -1494,7 +1447,7 @@ index 0000000..665928e
 +
 +int fpga_abort_fn(int cookie)
 +{
-+	return cookie;
++	return fpga_post_fn(cookie);
 +}
 +
 +int fpga_busy_fn(int cookie)
@@ -1519,9 +1472,9 @@ index 0000000..665928e
 +/*
 + * Initialize the fpga.  Return 1 on success, 0 on failure.
 + */
-+int APF51_init_fpga(u_char *buffer, size_t size)
++int APF51_init_fpga(void)
 +{
-+	int i, lout = 0;
++	int i;
 +
 +	fpga_init();
 +
@@ -1530,17 +1483,7 @@ index 0000000..665928e
 +		fpga_add(fpga_xilinx, &fpga[i]);
 +	}
 +
-+	if ((size >= fpga[0].size)) {
-+		printf("Loading FPGA...");
-+		if (FPGA_SUCCESS != fpga_load(0, (void *)buffer, size)) {
-+			lout = 1;
-+			printf("firmware download failed!\n");
-+		} else {
-+			printf("firmware successfully programmed\n");
-+		}
-+	}
-+
-+	return lout;
++	return 0;
 +}
 +
 +#endif /* CONFIG_FPGA */
@@ -1575,7 +1518,7 @@ index 0000000..f22f4d8
 + * MA 02111-1307 USA
 + *
 + */
-+extern int APF51_init_fpga(u_char *buffer, size_t size);
++extern int APF51_init_fpga(void);
 +
 +extern int fpga_pre_fn(int cookie);
 +extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie);


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-368-gd79da81

From: jorasse <jo...@us...> - 2013-08-09 15:56:35

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  d79da81bcafc3808681495b4369acae09f07f940 (commit)
      from  638cfbde73437a8e579ce7d1baabdcbc1f27d68c (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 d79da81bcafc3808681495b4369acae09f07f940
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Aug 9 18:05:32 2013 +0200

    [UBOOT] spartan: Fix FPGA download issue when firmware is not valid - also add user inerface to stop download using ctrl-c

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

Summary of changes:
 patches/u-boot/2013.04/320-spartan.patch |   68 ++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/patches/u-boot/2013.04/320-spartan.patch b/patches/u-boot/2013.04/320-spartan.patch
index 8659bf5..5a58b73 100644
--- a/patches/u-boot/2013.04/320-spartan.patch
+++ b/patches/u-boot/2013.04/320-spartan.patch
@@ -11,37 +11,61 @@ diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
 index 1633a70..9ca0522 100644
 --- a/drivers/fpga/spartan3.c
 +++ b/drivers/fpga/spartan3.c
-@@ -188,7 +188,7 @@ static int Spartan3_sp_load(Xilinx_desc *desc, const void *buf, size_t bsize)
- 		(*fn->clk) (TRUE, TRUE, cookie);	/* Assert the clock pin */
+@@ -188,8 +188,14 @@ static int Spartan3_sp_load(Xilinx_desc
+ 		(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
  
  		/* Load the data */
 -		while (bytecount < bsize) {
-+		while ( (*fn->done) (cookie) == FPGA_FAIL){
- 			/* XXX - do we check for an Ctrl-C press in here ??? */
+-			/* XXX - do we check for an Ctrl-C press in here ??? */
++		while ( ((*fn->done) (cookie) != FPGA_SUCCESS)
++			&& (bytecount < bsize)) {
++#ifdef CONFIG_SYS_FPGA_CHECK_CTRLC
++			if (ctrlc ()) {
++				(*fn->abort) (cookie);
++				return FPGA_FAIL;
++			}
++#endif
  			/* XXX - Check the error bit? */
  
-@@ -198,8 +198,8 @@ static int Spartan3_sp_load(Xilinx_desc *desc, const void *buf, size_t bsize)
- 			CONFIG_FPGA_DELAY ();
- 			(*fn->clk) (TRUE, TRUE, cookie);	/* Assert the clock pin */
+ 			(*fn->wdata) (data[bytecount++], true, cookie); /* write the data */
+@@ -288,7 +294,12 @@ static int Spartan3_sp_dump(Xilinx_desc
  
--#ifdef CONFIG_SYS_FPGA_CHECK_BUSY
- 			ts = get_timer (0);	/* get current time */
-+#ifdef CONFIG_SYS_FPGA_CHECK_BUSY
- 			while ((*fn->busy) (cookie)) {
- 				/* XXX - we should have a check in here somewhere to
- 				 * make sure we aren't busy forever... */
-@@ -216,6 +216,11 @@ static int Spartan3_sp_load(Xilinx_desc *desc, const void *buf, size_t bsize)
- 				}
- 			}
- #endif
-+			if (get_timer (ts) > CONFIG_SYS_FPGA_WAIT) {	/* check the time */
-+				puts ("** Timeout waiting for BUSY to clear.\n");
-+				(*fn->abort) (cookie);	/* abort the burn */
+ 		/* dump the data */
+ 		while (bytecount < bsize) {
+-			/* XXX - do we check for an Ctrl-C press in here ??? */
++#ifdef CONFIG_SYS_FPGA_CHECK_CTRLC
++			if (ctrlc ()) {
++				(*fn->abort) (cookie);
 +				return FPGA_FAIL;
 +			}
++#endif
+ 
+ 			(*fn->clk) (false, true, cookie);	/* Deassert the clock pin */
+ 			(*fn->clk) (true, true, cookie);	/* Assert the clock pin */
+@@ -392,6 +403,12 @@ static int Spartan3_ss_load(Xilinx_desc
+ 			(*fn->bwr) (data, bsize, true, cookie);
+ 		else {
+ 			while (bytecount < bsize) {
++#ifdef CONFIG_SYS_FPGA_CHECK_CTRLC
++				if (ctrlc ()) {
++					(*fn->abort) (cookie);
++					return FPGA_FAIL;
++				}
++#endif
+ 
+ 				/* Xilinx detects an error if INIT goes low (active)
+ 				   while DONE is low (inactive) */
+--- uboot-custom/include/fpga.h
++++ uboot-custom/include/fpga.h
+@@ -43,7 +43,7 @@
+ 
+ /* fpga_xxxx function return value definitions */
+ #define FPGA_SUCCESS		0
+-#define FPGA_FAIL		-1
++#define FPGA_FAIL		1
  
- #ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
- 			if (bytecount % (bsize / 40) == 0)
+ /* device numbers must be non-negative */
+ #define FPGA_INVALID_DEVICE	-1
 -- 
 1.7.2.5
 


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-367-g638cfbd

From: jorasse <jo...@us...> - 2013-08-09 09:22:59

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  638cfbde73437a8e579ce7d1baabdcbc1f27d68c (commit)
      from  af4084b890cb33e45c7403e9935f37b331ddf046 (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 638cfbde73437a8e579ce7d1baabdcbc1f27d68c
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Aug 9 11:32:10 2013 +0200

    [UBOOT] improvement environment scripts

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

Summary of changes:
 .../target/device/armadeus/u-boot-env-2013.04.txt  |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

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 25cd39f..db77f1c 100644
--- a/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
+++ b/buildroot/target/device/armadeus/u-boot-env-2013.04.txt
@@ -3,29 +3,34 @@
 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 loadb 0 ${loadaddr} ${firmware_size};
-checknload_firmware=if test -n ${firmware_autoload}; then if test -n ${had_ctrlc}; then echo Firmware download stopped!; else run load_firmware && echo Firmware successfully programmed; fi; fi;
+load_firmware=nand read ${loadaddr} firmware && fpga loadb 0 ${loadaddr} ${firmware_size} || fpga loadb 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;
+
 # DTB
 download_dtb=tftpboot ${loadaddr} ${cpu_name}-${board_name}.dtb
 flash_dtb=nand erase.part dtb;if nand write.trimffs ${fileaddr} dtb ${filesize};then echo Flashing of rootfs succeed;else echo Flashing of rootfs failed;fi
 update_dtb=run download_dtb flash_dtb
+
 # kernel
 download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin
 flash_kernel=nand erase.part kernel;if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};then echo Flashing of kernel succeed;else echo Flashing of kernel failed;fi
 update_kernel=run download_kernel flash_kernel
+
 # rootfs
 download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi
 flash_rootfs=nand erase.part rootfs;if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};then echo Flashing of rootfs succeed;else echo Flashing of rootfs failed;fi
 update_rootfs=run download_rootfs flash_rootfs
+
 # update
 update_all=run update_kernel update_rootfs update_env update_uboot
+
 # boot
 addipargs=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:eth0:off
 addmmcargs=setenv bootargs ${bootargs} root=/dev/mmcblk0p1 rootfstype=ext2
-mmcboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addmmcargs addipargs;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; fi;mmc dev 0; ext2load mmc 0 ${kernel_addr_r} /boot/${board_name}-linux.bin;bootm ${kernel_addr_r} - ${fdt_addr_r}
+mmcboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addmmcargs addipargs;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; else echo no fdt_addr_r; fi;mmc dev 0; ext2load mmc 0 ${kernel_addr_r} /boot/${board_name}-linux.bin;bootm ${kernel_addr_r} - ${fdt_addr_r}
 addnfsargs=setenv bootargs ${bootargs} root=/dev/nfs rw nfsroot=${serverip}:${rootpath}
-nfsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addnfsargs addipargs;nfs ${kernel_addr_r} ${serverip}:${rootpath}/boot/${board_name}-linux.bin;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; fi;bootm ${kernel_addr_r} - ${fdt_addr_r}
+nfsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs}; run addnfsargs addipargs;nfs ${kernel_addr_r} ${serverip}:${rootpath}/boot/${board_name}-linux.bin;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; else echo no fdt_addr_r; fi;bootm ${kernel_addr_r} - ${fdt_addr_r}
 addubifsargs=setenv bootargs ${bootargs} ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs
-ubifsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs};run addubifsargs addipargs;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; fi;nboot ${kernel_addr_r} kernel;bootm ${kernel_addr_r} - ${fdt_addr_r}
+ubifsboot=setenv bootargs console=${consoledev},${baudrate} ${mtdparts} ${extrabootargs};run addubifsargs addipargs;if test -n ${fdt_addr_r}  ; then nand read ${fdt_addr_r} dtb; else echo no fdt_addr_r; fi;nboot ${kernel_addr_r} kernel;bootm ${kernel_addr_r} - ${fdt_addr_r}
 preboot=run check_flash checknload_firmware check_env ;
 


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-366-gaf4084b

From: jorasse <jo...@us...> - 2013-08-09 09:20: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  af4084b890cb33e45c7403e9935f37b331ddf046 (commit)
      from  4db8e87f77180c2d706e004a23d3fe3e93d5a156 (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 af4084b890cb33e45c7403e9935f37b331ddf046
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Aug 9 11:30:05 2013 +0200

    [UBOOT] apf51: fix nand lock/unlock page alignement and access to IP registers

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

Summary of changes:
 patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch |   36 ++++++++++++++-----
 1 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch b/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch
index 900533e..db96176 100644
--- a/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch
+++ b/patches/u-boot/2013.04/420-apf51-nand-spl-NG.patch
@@ -328,7 +328,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  OBJS	:= $(addprefix $(obj),$(COBJS))
 --- uboot-custom/drivers/mtd/nand/mxc_nand.c
 +++ uboot-custom/drivers/mtd/nand/mxc_nand.c
-@@ -1108,7 +1108,53 @@ void mxc_nand_command(struct mtd_info *m
+@@ -1108,7 +1108,65 @@ void mxc_nand_command(struct mtd_info *m
  
  		break;
  #ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
@@ -336,39 +336,51 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 +#if defined(MXC_NFC_V3_2)
 +	case NAND_CMD_LOCK:
 +		/* Lock Block whole NAND only supported */
++		writenfc(NFC_V3_IPC_CREQ, &host->ip_regs->ipc);
++		while (!(readnfc(&host->ip_regs->ipc) & NFC_V3_IPC_CACK));
 +		writenfc(NFC_V3_WRPROT_BLS_UNLOCK | NFC_V3_WRPROT_LOCK,
 +			&host->ip_regs->wrprot);
++		writenfc(0, &host->ip_regs->ipc);
 +		return;
 +	case NAND_CMD_LOCK_TIGHT:
 +		/* Lock Tight whole NAND only supported */
++		writenfc(NFC_V3_IPC_CREQ, &host->ip_regs->ipc);
++		while (!(readnfc(&host->ip_regs->ipc) & NFC_V3_IPC_CACK));
 +		writenfc(NFC_V3_WRPROT_BLS_UNLOCK | NFC_V3_WRPROT_LOCKTIGHT,
 +			&host->ip_regs->wrprot);
++		writenfc(0, &host->ip_regs->ipc);
 +		return;
 +	case NAND_CMD_UNLOCK1:
 +		/*  64 pages per block only */
-+		writenfc(page_addr>>6,
++		writenfc(NFC_V3_IPC_CREQ, &host->ip_regs->ipc);
++		while (!(readnfc(&host->ip_regs->ipc) & NFC_V3_IPC_CACK));
++		writenfc(page_addr>>7,
 +				&host->ip_regs->wrprot_unlock_blkaddr);
++		writenfc(0, &host->ip_regs->ipc);
 +		return;
 +	case NAND_CMD_UNLOCK2:{
-+		int temp = readnfc(&host->ip_regs->wrprot_unlock_blkaddr)
-+					& 0x0000FFFF;
-+		writenfc(((page_addr>>6)<<16) | temp ,
++		int temp;
++		writenfc(NFC_V3_IPC_CREQ, &host->ip_regs->ipc);
++		while (!(readnfc(&host->ip_regs->ipc) & NFC_V3_IPC_CACK));
++		temp = readnfc(&host->ip_regs->wrprot_unlock_blkaddr)
++			& 0x0000FFFF;
++		writenfc(((page_addr>>7)<<16) | temp ,
 +				&host->ip_regs->wrprot_unlock_blkaddr);
 +		/* Unlock Block Command for given address range */
 +		writenfc(NFC_V3_WRPROT_BLS_UNLOCK | NFC_V3_WRPROT_UNLOCK,
 +			&host->ip_regs->wrprot);
++		writenfc(0, &host->ip_regs->ipc);
 +		}
 +		return;
 +	case NAND_CMD_LOCK_STATUS:{
 +		void __iomem *main_buf = host->regs->main_area[0];
 +		host->col_addr = 0;
 +		host->spare_only = false;
-+		MTDDEBUG(MTD_DEBUG_LEVEL3,"get_lock_status %x\n", readnfc(&host->ip_regs->wrprot));
 +
 +		if (((readnfc(&host->ip_regs->wrprot)>>8) & NFC_WRPR_US)
 +			&& !((readnfc(&host->ip_regs->wrprot)>>8) & NFC_WRPR_LTS)
-+			&& (((readnfc(&host->ip_regs->wrprot_unlock_blkaddr)>>16) >= page_addr>>6)
-+			&& ((readnfc(&host->ip_regs->wrprot_unlock_blkaddr)& 0x0000FFFF) <= page_addr>>6))) {
++			&& (((readnfc(&host->ip_regs->wrprot_unlock_blkaddr)>>16) >= page_addr>>7)
++			&& ((readnfc(&host->ip_regs->wrprot_unlock_blkaddr)& 0x0000FFFF) <= page_addr>>7))) {
 +			writew(NFC_WRPR_US, main_buf);
 +		} else if ((readnfc(&host->ip_regs->wrprot)>>8) & NFC_WRPR_LTS) {
 +			writew((readnfc(&host->ip_regs->wrprot)>>8), main_buf);
@@ -383,7 +395,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  		/* Blocks to be unlocked */
  		writew(-1, &host->regs->unlockstart_blkaddr);
  		writew(-1, &host->regs->unlockend_blkaddr);
-@@ -1150,6 +1182,7 @@ void mxc_nand_command(struct mtd_info *m
+@@ -1150,6 +1208,7 @@ void mxc_nand_command(struct mtd_info *m
  			writew(readw(&host->regs->nf_wrprst) & ~NFC_WRPR_US, &host->regs->main_area[0][0]);
  		}
  		return;
@@ -393,7 +405,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  
 --- uboot-custom/drivers/mtd/nand/mxc_nand.h
 +++ uboot-custom/drivers/mtd/nand/mxc_nand.h
-@@ -207,6 +207,8 @@ struct mxc_nand_ip_regs {
+@@ -207,9 +207,12 @@ struct mxc_nand_ip_regs {
  #define NFC_V3_CONFIG3_NO_SDMA		(1 << 20)
  
  #define NFC_V3_WRPROT_UNLOCK		(1 << 2)
@@ -402,3 +414,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
  #define NFC_V3_WRPROT_BLS_UNLOCK	(2 << 6)
  
  #define NFC_V3_IPC_CREQ			(1 << 0)
++#define NFC_V3_IPC_CACK			(1 << 1)
+ #define NFC_V3_IPC_INT			(1 << 31)
+ 
+ #if defined(MXC_NFC_V1) || defined(MXC_NFC_V2_1)


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-365-g4db8e87

From: Gwenhael Goavec-M. <gwe...@us...> - 2013-08-09 08:28:06

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  4db8e87f77180c2d706e004a23d3fe3e93d5a156 (commit)
       via  1385339d17cfca7313abd91125a109ba5515bb14 (commit)
       via  8eb569ed4d5ece5de02cb50acffbd4c05a0cdb5f (commit)
       via  7079412580758a080dc3bf1dca852e0cb5b5324e (commit)
       via  d5aa2ab2ed1b3d8236ecf16bc3652ad8a64b4e5d (commit)
      from  1a21f9d6163e817dbb2a1423810685e05cb7c907 (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 4db8e87f77180c2d706e004a23d3fe3e93d5a156
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Fri Aug 9 10:28:03 2013 +0200

    [LINUX][3.11] 0204: update hook to dt

commit 1385339d17cfca7313abd91125a109ba5515bb14
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Fri Aug 9 10:27:18 2013 +0200

    [LINUX][3.11] imxfb: dt: add pwmr attribute

commit 8eb569ed4d5ece5de02cb50acffbd4c05a0cdb5f
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Fri Aug 9 10:26:13 2013 +0200

    [LINUX][3.11] imx27-apf27dev: add framebuffer and display support

commit 7079412580758a080dc3bf1dca852e0cb5b5324e
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Fri Aug 9 10:25:12 2013 +0200

    [LINUX][3.11] imx27: dt: add framebuffer pinctrl

commit d5aa2ab2ed1b3d8236ecf16bc3652ad8a64b4e5d
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Fri Aug 9 10:24:33 2013 +0200

    [LINUX][3.11] imx27: dt: backport framebuffer support

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

Summary of changes:
 ...rmadeus-mx27-imxfb-fix_pwm_contrast_issue.patch |   54 ++++++++++++++------
 ...naro-imx27-dts-add_imx_framebuffer_device.patch |   35 +++++++++++++
 ...madeus-imx27_dtsi-add_framebuffer_pinctrl.patch |   48 +++++++++++++++++
 ...armadeus-imx27-apf27dev-add_imxfb_support.patch |   50 ++++++++++++++++++
 ...re_to_setup_PWM_Contrast_Control_Register.patch |   49 ++++++++++++++++++
 5 files changed, 220 insertions(+), 16 deletions(-)
 create mode 100644 patches/linux/3.11/0208-linaro-imx27-dts-add_imx_framebuffer_device.patch
 create mode 100644 patches/linux/3.11/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
 create mode 100644 patches/linux/3.11/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
 create mode 100644 patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch

diff --git a/patches/linux/3.11/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch b/patches/linux/3.11/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
index 2d18bbd..1172852 100644
--- a/patches/linux/3.11/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
+++ b/patches/linux/3.11/0204-armadeus-mx27-imxfb-fix_pwm_contrast_issue.patch
@@ -10,34 +10,56 @@ Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
  drivers/video/imxfb.c |   10 ++++++++++
  1 files changed, 10 insertions(+), 0 deletions(-)
 
-diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
-index 38733ac..0289f86 100644
---- a/drivers/video/imxfb.c
-+++ b/drivers/video/imxfb.c
-@@ -866,6 +866,9 @@ static int imxfb_probe(struct platform_device *pdev)
+Index: linux-3.11-rc3/drivers/video/imxfb.c
+===================================================================
+--- linux-3.11-rc3.orig/drivers/video/imxfb.c
++++ linux-3.11-rc3/drivers/video/imxfb.c
+@@ -137,6 +137,7 @@ struct imxfb_rgb {
+ enum imxfb_type {
+ 	IMX1_FB,
+ 	IMX21_FB,
++	IMX27_FB,
+ };
+ 
+ struct imxfb_info {
+@@ -189,6 +190,9 @@ static struct platform_device_id imxfb_d
+ 		.name = "imx21-fb",
+ 		.driver_data = IMX21_FB,
+ 	}, {
++		.name = "imx27-fb",
++		.driver_data = IMX27_FB,
++	}, {
+ 		/* sentinel */
+ 	}
+ };
+@@ -202,6 +206,9 @@ static struct of_device_id imxfb_of_dev_
+ 		.compatible = "fsl,imx21-fb",
+ 		.data = &imxfb_devtype[IMX21_FB],
+ 	}, {
++		.compatible = "fsl,imx27-fb",
++		.data = &imxfb_devtype[IMX27_FB],
++	}, {
+ 		/* sentinel */
+ 	}
+ };
+@@ -866,6 +873,7 @@ static int imxfb_probe(struct platform_d
  	const struct of_device_id *of_id;
  	int ret, i;
  	int bytes_per_pixel;
-+#ifdef CONFIG_SOC_IMX27
 +	unsigned long per3clk;
-+#endif
  
  	dev_info(&pdev->dev, "i.MX Framebuffer driver\n");
  
-@@ -959,6 +962,13 @@ static int imxfb_probe(struct platform_device *pdev)
+@@ -959,6 +967,12 @@ static int imxfb_probe(struct platform_d
  		goto failed_getclock;
  	}
  
-+#ifdef CONFIG_SOC_IMX27
-+	per3clk = clk_round_rate(fbi->clk_per, 134000000);
-+	if (clk_set_rate(fbi->clk_per, per3clk)) {
-+		pr_debug("mx2fb: Unable to set clock to %lu\n", per3clk);
++	if (fbi->devtype == IMX27_FB) {
++		per3clk = clk_round_rate(fbi->clk_per, 134000000);
++		if (clk_set_rate(fbi->clk_per, per3clk))
++			pr_debug("mx2fb: Unable to set clock to %lu\n", per3clk);
 +	}
-+#endif
 +
  	fbi->regs = ioremap(res->start, resource_size(res));
  	if (fbi->regs == NULL) {
  		dev_err(&pdev->dev, "Cannot map frame buffer registers\n");
--- 
-1.7.4.4
-
diff --git a/patches/linux/3.11/0208-linaro-imx27-dts-add_imx_framebuffer_device.patch b/patches/linux/3.11/0208-linaro-imx27-dts-add_imx_framebuffer_device.patch
new file mode 100644
index 0000000..46a1edf
--- /dev/null
+++ b/patches/linux/3.11/0208-linaro-imx27-dts-add_imx_framebuffer_device.patch
@@ -0,0 +1,35 @@
+From ec3b0ca2d3e1ee855f8b126e62098c8ce3214cf1 Mon Sep 17 00:00:00 2001
+From: Markus Pargmann <mp...@pe...>
+Date: Fri, 28 Jun 2013 16:50:34 +0200
+Subject: [PATCH] ARM: dts: imx27: Add imx framebuffer device
+
+Signed-off-by: Markus Pargmann <mp...@pe...>
+Acked-by: Sascha Hauer <s....@pe...>
+Signed-off-by: Shawn Guo <sha...@li...>
+---
+ arch/arm/boot/dts/imx27.dtsi |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
+index 36836ee..c5747d7 100644
+--- a/arch/arm/boot/dts/imx27.dtsi
++++ b/arch/arm/boot/dts/imx27.dtsi
+@@ -366,6 +366,15 @@
+ 			reg = <0x10020000 0x20000>;
+ 			ranges;
+ 
++			fb: fb@10021000 {
++				compatible = "fsl,imx27-fb";
++				interrupts = <61>;
++				reg = <0x10021000 0x1000>;
++				clocks = <&clks 36>, <&clks 65>, <&clks 59>;
++				clock-names = "ipg", "ahb", "per";
++				status = "disabled";
++			};
++
+ 			coda: coda@10023000 {
+ 				compatible = "fsl,imx27-vpu";
+ 				reg = <0x10023000 0x0200>;
+-- 
+1.7.9.5
+
diff --git a/patches/linux/3.11/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch b/patches/linux/3.11/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
new file mode 100644
index 0000000..7f1f571
--- /dev/null
+++ b/patches/linux/3.11/0209-armadeus-imx27_dtsi-add_framebuffer_pinctrl.patch
@@ -0,0 +1,48 @@
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.11-rc3/arch/arm/boot/dts/imx27.dtsi
+===================================================================
+--- linux-3.11-rc3.orig/arch/arm/boot/dts/imx27.dtsi
++++ linux-3.11-rc3/arch/arm/boot/dts/imx27.dtsi
+@@ -316,6 +316,40 @@
+ 					};
+ 				};
+ 
++				imxfb {
++					pinctrl_imxfb: imxfb-1 {
++						fsl,pins = <
++							MX27_PAD_LSCLK__LSCLK 0x0
++							MX27_PAD_LD0__LD0 0x0
++							MX27_PAD_LD1__LD1 0x0
++							MX27_PAD_LD2__LD2 0x0
++							MX27_PAD_LD3__LD3 0x0
++							MX27_PAD_LD4__LD4 0x0
++							MX27_PAD_LD5__LD5 0x0
++							MX27_PAD_LD6__LD6 0x0
++							MX27_PAD_LD7__LD7 0x0
++							MX27_PAD_LD8__LD8 0x0
++							MX27_PAD_LD9__LD9 0x0
++							MX27_PAD_LD10__LD10 0x0
++							MX27_PAD_LD11__LD11 0x0
++							MX27_PAD_LD12__LD12 0x0
++							MX27_PAD_LD13__LD13 0x0
++							MX27_PAD_LD14__LD14 0x0
++							MX27_PAD_LD15__LD15 0x0
++							MX27_PAD_LD16__LD16 0x0
++							MX27_PAD_LD17__LD17 0x0
++							MX27_PAD_REV__REV 0x0
++							MX27_PAD_CLS__CLS 0x0
++							MX27_PAD_PS__PS 0x0
++							MX27_PAD_SPL_SPR__SPL_SPR 0x0
++							MX27_PAD_HSYNC__HSYNC 0x0
++							MX27_PAD_VSYNC__VSYNC 0x0
++							MX27_PAD_CONTRAST__CONTRAST 0x0
++							MX27_PAD_OE_ACD__OE_ACD 0x0
++						>;
++					};
++				};
++
+ 				owire {
+ 					pinctrl_owire: owire-1 {
+ 						fsl,pins = <
diff --git a/patches/linux/3.11/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch b/patches/linux/3.11/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
new file mode 100644
index 0000000..1a94c96
--- /dev/null
+++ b/patches/linux/3.11/0210-armadeus-imx27-apf27dev-add_imxfb_support.patch
@@ -0,0 +1,50 @@
+
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+---
+Index: linux-3.11-rc3/arch/arm/boot/dts/imx27-apf27dev.dts
+===================================================================
+--- linux-3.11-rc3.orig/arch/arm/boot/dts/imx27-apf27dev.dts
++++ linux-3.11-rc3/arch/arm/boot/dts/imx27-apf27dev.dts
+@@ -35,6 +35,26 @@
+ 			linux,default-trigger = "heartbeat";
+ 		};
+ 	};
++
++	display0: display0 {
++		model = "Chimei-LW700AT9003";
++		native-mode = <&timing0>;
++		bits-per-pixel = <16>;  /* non-standard but required */
++		fsl,pcr = <0xfae80083>; /* non-standard but required */
++		display-timings {
++			timing0: timing0 {
++				clock-frequency = <33000033>;
++				hactive = <800>;
++				vactive = <480>;
++				hback-porch = <96>;
++				hfront-porch = <96>;
++				vback-porch = <20>;
++				vfront-porch = <21>;
++				hsync-len = <64>;
++				vsync-len = <4>;
++			};
++		};
++	};
+ };
+ 
+ &cspi1 {
+@@ -64,6 +84,15 @@
+ 	status = "okay";
+ };
+ 
++&fb {
++	display = <&display0>;
++	fsl,pwmr = <0x00a903ff>;
++	fsl,dmacr = <0x00020010>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&pinctrl_imxfb>;
++	status = "okay";
++};
++
+ &iomuxc {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_hog>;
diff --git a/patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch b/patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
new file mode 100644
index 0000000..cb6fbce
--- /dev/null
+++ b/patches/linux/3.11/0211-linaro-imx-framebuffer-Add_feature_to_setup_PWM_Contrast_Control_Register.patch
@@ -0,0 +1,49 @@
+This patch adds feature to setup PWM Contrast Control Register.
+This register is used to control the signal output at the contrast pin,
+which controls contrast of the LCD panel.
+
+Signed-off-by: Alexander Shiyan <shc...@ma...>
+---
+ Documentation/devicetree/bindings/video/fsl,imx-fb.txt | 1 +
+ drivers/video/imxfb.c                                  | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+Index: linux-3.11-rc3/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
+===================================================================
+--- linux-3.11-rc3.orig/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
++++ linux-3.11-rc3/Documentation/devicetree/bindings/video/fsl,imx-fb.txt
+@@ -18,6 +18,7 @@ Optional properties:
+ - fsl,dmacr: DMA Control Register value. This is optional. By default, the
+ 	register is not modified as recommended by the datasheet.
+ - fsl,lscr1: LCDC Sharp Configuration Register value.
++- fsl,pwmr: LCDC PWM Contrast Control Register value.
+ 
+ Example:
+ 
+Index: linux-3.11-rc3/drivers/video/imxfb.c
+===================================================================
+--- linux-3.11-rc3.orig/drivers/video/imxfb.c
++++ linux-3.11-rc3/drivers/video/imxfb.c
+@@ -814,8 +814,8 @@ static int imxfb_init_fbinfo(struct plat
+ 
+ 		fbi->lscr1 = IMXFB_LSCR1_DEFAULT;
+ 		of_property_read_u32(np, "fsl,lscr1", &fbi->lscr1);
+-
+ 		of_property_read_u32(np, "fsl,dmacr", &fbi->dmacr);
++		of_property_read_u32(np, "fsl,pwmr", &fbi->pwmr);
+ 
+ 		/* These two function pointers could be used by some specific
+ 		 * platforms. */
+Index: linux-3.11-rc3/drivers/video/Kconfig
+===================================================================
+--- linux-3.11-rc3.orig/drivers/video/Kconfig
++++ linux-3.11-rc3/drivers/video/Kconfig
+@@ -363,7 +363,7 @@ config FB_SA1100
+ 
+ config FB_IMX
+ 	tristate "Freescale i.MX1/21/25/27 LCD support"
+-	depends on FB && IMX_HAVE_PLATFORM_IMX_FB
++	depends on FB 
+ 	select FB_CFB_FILLRECT
+ 	select FB_CFB_COPYAREA
+ 	select FB_CFB_IMAGEBLIT


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-360-g1a21f9d

From: Gwenhael Goavec-M. <gwe...@us...> - 2013-08-09 08:21:58

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  1a21f9d6163e817dbb2a1423810685e05cb7c907 (commit)
      from  e90f11515f38c0621d237ff9617ac24ff8ee80d4 (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 1a21f9d6163e817dbb2a1423810685e05cb7c907
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Fri Aug 9 10:22:06 2013 +0200

    [LINUX][3.11] move APF27 support to 3.11-rc4

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

Summary of changes:
 ...3.11-rc3.config => apf27-linux-3.11-rc4.config} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.11-rc3.config => apf27-linux-3.11-rc4.config} (100%)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.11-rc3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.11-rc4.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.11-rc3.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.11-rc4.config


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-359-ge90f115

From: Julien B a. A. <ar...@us...> - 2013-08-08 20:57:36

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  e90f11515f38c0621d237ff9617ac24ff8ee80d4 (commit)
      from  92a80f04e63cb8c5c741846ea777471034931307 (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 e90f11515f38c0621d237ff9617ac24ff8ee80d4
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Aug 8 22:10:01 2013 +0200

    [LINUX] 3.11: move APF51 experimental support to 3.11-rc4

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

Summary of changes:
 .../armadeus/apf51/apf51-linux-3.11-rc1.config     |  264 --------------------
 .../armadeus/apf51/apf51-linux-3.11-rc4.config     |    1 +
 patches/linux/{3.11-rc3 => 3.11-rc4}               |    0
 3 files changed, 1 insertions(+), 264 deletions(-)
 delete mode 100644 buildroot/target/device/armadeus/apf51/apf51-linux-3.11-rc1.config
 create mode 120000 buildroot/target/device/armadeus/apf51/apf51-linux-3.11-rc4.config
 rename patches/linux/{3.11-rc3 => 3.11-rc4} (100%)

diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11-rc1.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.11-rc1.config
deleted file mode 100644
index 748119c..0000000
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11-rc1.config
+++ /dev/null
@@ -1,264 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_MXC=y
-CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MACH_IMX51_DT=y
-CONFIG_ARM_THUMBEE=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPU_FREQ_IMX=y
-CONFIG_CPU_IDLE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-# CONFIG_SUSPEND is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
-CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_MCP251X=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=y
-CONFIG_BT_SCO=y
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RC_PID=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_FW_LOADER=m
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_UBI=y
-CONFIG_MISC_DEVICES=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-CONFIG_RTL8187=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_RT2X00=m
-CONFIG_RT73USB=m
-CONFIG_ZD1211RW=m
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_IMX=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_WM831X=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WM831X_ON=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_IMX=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_WM831X=m
-CONFIG_POWER_SUPPLY=m
-CONFIG_WM831X_BACKUP=m
-CONFIG_WM831X_POWER=m
-CONFIG_HWMON=m
-CONFIG_SENSORS_AS1531=m
-CONFIG_SENSORS_WM831X=m
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_WM831X_WATCHDOG=m
-CONFIG_IMX2_WDT=y
-CONFIG_MFD_WM831X_I2C=y
-CONFIG_MFD_IMX_IPU_V3=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_VIDEO_DEV=m
-# CONFIG_RC_CORE is not set
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-# CONFIG_MEDIA_TUNER_MC44S803 is not set
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-# CONFIG_MEDIA_TUNER_TDA18218 is not set
-CONFIG_VIDEO_VIVI=m
-CONFIG_USB_VIDEO_CLASS=m
-# CONFIG_RADIO_ADAPTERS is not set
-CONFIG_FB=y
-CONFIG_FB_MX5=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_SOUND=m
-# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
-CONFIG_SND_SOC=m
-CONFIG_SND_IMX_SOC=m
-CONFIG_SND_SOC_APF51_DEV_WM8960=m
-CONFIG_USB=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_SUSPEND=y
-CONFIG_USB_OTG=y
-# CONFIG_USB_OTG_WHITELIST is not set
-CONFIG_USB_MON=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
-CONFIG_USB_WDM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_PHY=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_USB_GPIO_VBUS=y
-CONFIG_USB_ULPI=y
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_GADGET_DEBUG_FS=y
-CONFIG_USB_ETH=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_USB_G_HID=m
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_ESDHC_IMX=y
-CONFIG_MMC_SPI=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_MXC=y
-CONFIG_RTC_DRV_WM831X=y
-CONFIG_STAGING=y
-CONFIG_IIO=m
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_CMODE_NONE=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_FS=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.11-rc4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.11-rc4.config
new file mode 120000
index 0000000..3bcb168
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-3.11-rc4.config
@@ -0,0 +1 @@
+apf51-linux-3.11.config
\ No newline at end of file
diff --git a/patches/linux/3.11-rc3 b/patches/linux/3.11-rc4
similarity index 100%
rename from patches/linux/3.11-rc3
rename to patches/linux/3.11-rc4


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-358-g92a80f0

From: Gwenhael Goavec-M. <gwe...@us...> - 2013-08-08 17:18:42

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  92a80f04e63cb8c5c741846ea777471034931307 (commit)
      from  5fa854807659a95e92f60366dcb0234f0fedffbc (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 92a80f04e63cb8c5c741846ea777471034931307
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Thu Aug 8 19:18:52 2013 +0200

    [LINUX][3.11] patch 0206-b: the IS_ENABLED parameter must have CONFIG_

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

Summary of changes:
 ...inctrl-header_conditional_probe_functions.patch |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch b/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch
index 9e3df77..197eb1b 100644
--- a/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch
+++ b/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch
@@ -13,7 +13,7 @@ index bcedd99..446fc01 100644
  #define IMX_MUX_MASK	0x7
  #define IOMUXC_CONFIG_SION	(0x1 << 4)
  
-+#if IS_ENABLED(PINCTRL_IMX)
++#if IS_ENABLED(CONFIG_PINCTRL_IMX)
 +
  int imx_pinctrl_probe(struct platform_device *pdev,
  			struct imx_pinctrl_soc_info *info);


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-357-g5fa8548

From: jorasse <jo...@us...> - 2013-08-08 12:43:07

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  5fa854807659a95e92f60366dcb0234f0fedffbc (commit)
      from  5061c4cbd4004e0ba2b12dabc4338008fed89179 (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 5fa854807659a95e92f60366dcb0234f0fedffbc
Author: Philippe Reynes <tr...@ya...>
Date:   Tue Aug 6 21:52:28 2013 +0200

    [LINUX] 3.10: move to 3.10.5
    
    Signed-off-by: Philippe Reynes <tr...@ya...>

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

Summary of changes:
 ...nux-3.10.3.config => apf27-linux-3.10.5.config} |    0
 patches/linux/{3.10.3 => 3.10.5}                   |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.10.3.config => apf27-linux-3.10.5.config} (100%)
 rename patches/linux/{3.10.3 => 3.10.5} (100%)

diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.5.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.10.3.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.10.5.config
diff --git a/patches/linux/3.10.3 b/patches/linux/3.10.5
similarity index 100%
rename from patches/linux/3.10.3
rename to patches/linux/3.10.5


hooks/post-receive
-- 
armadeus

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-356-g5061c4c

From: Gwenhael Goavec-M. <gwe...@us...> - 2013-08-08 11:21:09

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  5061c4cbd4004e0ba2b12dabc4338008fed89179 (commit)
       via  0308bd50c6f97e978f97ada42e9c2760d3ee8c63 (commit)
      from  89ca9b6f4842c5ccbef5e6315e86e7bcc6077530 (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 5061c4cbd4004e0ba2b12dabc4338008fed89179
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Thu Aug 8 13:21:05 2013 +0200

    [LINUX][3.11] imx27-apf27dev.dts: Add hog pinctrl support

commit 0308bd50c6f97e978f97ada42e9c2760d3ee8c63
Author: Gwenhael Goavec-Merou <gwe...@ar...>
Date:   Thu Aug 8 13:19:21 2013 +0200

    [LINUX][3.11] imx: pinctrl: backport and adapt pinctrl support from linaro

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

Summary of changes:
 ...-gpio-Support_initialization_as_subdevice.patch |  112 +++
 ...inctrl-header_conditional_probe_functions.patch |   32 +
 .../0206-c-linaro-imx1-pinctrl-core-driver.patch   |  750 ++++++++++++++++++++
 ...aro-imx27-pinctrl-imx27_pincontrol_driver.patch |  593 ++++++++++++++++
 .../0206-e-linaro-imx27-dts-pin_functions.patch    |  542 ++++++++++++++
 .../0206-f-linaro-imx27-dts-imx27_pinctrl.patch    |  290 ++++++++
 .../3.11/0206-g-linaro-imx27-enable_pinctrl.patch  |   28 +
 .../0207-armadeus-apf27dev-add_hog_pinctrl.patch   |   24 +
 8 files changed, 2371 insertions(+), 0 deletions(-)
 create mode 100644 patches/linux/3.11/0206-a-linaro-mxc-gpio-Support_initialization_as_subdevice.patch
 create mode 100644 patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch
 create mode 100644 patches/linux/3.11/0206-c-linaro-imx1-pinctrl-core-driver.patch
 create mode 100644 patches/linux/3.11/0206-d-linaro-imx27-pinctrl-imx27_pincontrol_driver.patch
 create mode 100644 patches/linux/3.11/0206-e-linaro-imx27-dts-pin_functions.patch
 create mode 100644 patches/linux/3.11/0206-f-linaro-imx27-dts-imx27_pinctrl.patch
 create mode 100644 patches/linux/3.11/0206-g-linaro-imx27-enable_pinctrl.patch
 create mode 100644 patches/linux/3.11/0207-armadeus-apf27dev-add_hog_pinctrl.patch

diff --git a/patches/linux/3.11/0206-a-linaro-mxc-gpio-Support_initialization_as_subdevice.patch b/patches/linux/3.11/0206-a-linaro-mxc-gpio-Support_initialization_as_subdevice.patch
new file mode 100644
index 0000000..afb7dc8
--- /dev/null
+++ b/patches/linux/3.11/0206-a-linaro-mxc-gpio-Support_initialization_as_subdevice.patch
@@ -0,0 +1,112 @@
+On imx27 and imx21, there is no clear seperation between iomux control
+registers and GPIO data registers. For easier pingroup definitions, the
+gpio drivers will be initialized as subnodes of the iomux controller. It
+is necessary to share the registers between iomux and gpio.
+
+This patch adds support to pass a register memory region via platform
+data.
+
+Signed-off-by: Markus Pargmann <mp...@pe...>
+---
+ drivers/gpio/gpio-mxc.c                | 18 ++++++++++++++----
+ include/linux/platform_data/gpio-mxc.h | 17 +++++++++++++++++
+ 2 files changed, 31 insertions(+), 4 deletions(-)
+ create mode 100644 include/linux/platform_data/gpio-mxc.h
+
+diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
+index 875a7c5..41922e8 100644
+--- a/drivers/gpio/gpio-mxc.c
++++ b/drivers/gpio/gpio-mxc.c
+@@ -26,6 +26,7 @@
+ #include <linux/irqdomain.h>
+ #include <linux/irqchip/chained_irq.h>
+ #include <linux/gpio.h>
++#include <linux/platform_data/gpio-mxc.h>
+ #include <linux/platform_device.h>
+ #include <linux/slab.h>
+ #include <linux/basic_mmio_gpio.h>
+@@ -400,6 +401,7 @@
+ 	struct device_node *np = pdev->dev.of_node;
+ 	struct mxc_gpio_port *port;
+ 	struct resource *iores;
++	struct mxc_gpio_platform_data *pdata = pdev->dev.platform_data;
+ 	int irq_base;
+ 	int err;
+ 
+@@ -409,22 +411,30 @@
+ 	if (!port)
+ 		return -ENOMEM;
+ 
+-	iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+-	if (!iores) {
+-		err = -ENODEV;
+-		goto out_kfree;
+-	}
++	if (pdata) {
++		port->base = pdata->base;
++		if (!pdata->base) {
++			dev_err(&pdev->dev, "No mapped memory in platform data\n");
++			return -EINVAL;
++		}
++	} else {
++		iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++		if (!iores) {
++			err = -ENODEV;
++			goto out_kfree;
++		}
+ 
+-	if (!request_mem_region(iores->start, resource_size(iores),
+-				pdev->name)) {
+-		err = -EBUSY;
+-		goto out_kfree;
+-	}
++		if (!request_mem_region(iores->start, resource_size(iores),
++					pdev->name)) {
++			err = -EBUSY;
++			goto out_kfree;
++		}
+ 
+-	port->base = ioremap(iores->start, resource_size(iores));
+-	if (!port->base) {
+-		err = -ENOMEM;
+-		goto out_release_mem;
++		port->base = ioremap(iores->start, resource_size(iores));
++		if (!port->base) {
++			err = -ENOMEM;
++			goto out_release_mem;
++		}
+ 	}
+ 
+ 	port->irq_high = platform_get_irq(pdev, 1);
+diff --git a/include/linux/platform_data/gpio-mxc.h b/include/linux/platform_data/gpio-mxc.h
+new file mode 100644
+index 0000000..fb3e06b
+--- /dev/null
++++ b/include/linux/platform_data/gpio-mxc.h
+@@ -0,0 +1,17 @@
++#ifndef _LINUX_GPIO_MXC_H
++#define _LINUX_GPIO_MXC_H
++
++#include <linux/types.h>
++
++/*
++ * MXC GPIO driver platform data. If this platform data is passed to the
++ * driver, it will use the memory base defined in the struct. This is used for
++ * iomuxc drivers on imx1/imx21/imx27, where the GPIO data register is embedded
++ * between iomuxc registers.
++ */
++
++struct mxc_gpio_platform_data {
++	void __iomem *base;
++};
++
++#endif /* _LINUX_GPIO_MXC_H */
+-- 
+1.8.3.2
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+lin...@li...
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+
diff --git a/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch b/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch
new file mode 100644
index 0000000..9e3df77
--- /dev/null
+++ b/patches/linux/3.11/0206-b-linaro-imx-pinctrl-header_conditional_probe_functions.patch
@@ -0,0 +1,32 @@
+The functions are not available if included by imx1 core driver.
+
+Signed-off-by: Markus Pargmann <mp...@pe...>
+---
+ drivers/pinctrl/pinctrl-imx.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/pinctrl/pinctrl-imx.h b/drivers/pinctrl/pinctrl-imx.h
+index bcedd99..446fc01 100644
+--- a/drivers/pinctrl/pinctrl-imx.h
++++ b/drivers/pinctrl/pinctrl-imx.h
+@@ -89,7 +89,11 @@ struct imx_pinctrl_soc_info {
+ #define IMX_MUX_MASK	0x7
+ #define IOMUXC_CONFIG_SION	(0x1 << 4)
+ 
++#if IS_ENABLED(PINCTRL_IMX)
++
+ int imx_pinctrl_probe(struct platform_device *pdev,
+ 			struct imx_pinctrl_soc_info *info);
+ int imx_pinctrl_remove(struct platform_device *pdev);
++
++#endif
+ #endif /* __DRIVERS_PINCTRL_IMX_H */
+-- 
+1.8.3.2
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+lin...@li...
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+
diff --git a/patches/linux/3.11/0206-c-linaro-imx1-pinctrl-core-driver.patch b/patches/linux/3.11/0206-c-linaro-imx1-pinctrl-core-driver.patch
new file mode 100644
index 0000000..547106f
--- /dev/null
+++ b/patches/linux/3.11/0206-c-linaro-imx1-pinctrl-core-driver.patch
@@ -0,0 +1,750 @@
+
+Signed-off-by: Markus Pargmann <mp...@pe...>
+---
+ drivers/pinctrl/Kconfig             |   5 +
+ drivers/pinctrl/Makefile            |   1 +
+ drivers/pinctrl/pinctrl-imx1-core.c | 667 ++++++++++++++++++++++++++++++++++++
+ drivers/pinctrl/pinctrl-imx1.h      |  23 ++
+ 4 files changed, 696 insertions(+)
+ create mode 100644 drivers/pinctrl/pinctrl-imx1-core.c
+ create mode 100644 drivers/pinctrl/pinctrl-imx1.h
+
+diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
+index bc830af..266a206 100644
+--- a/drivers/pinctrl/Kconfig
++++ b/drivers/pinctrl/Kconfig
+@@ -80,6 +80,11 @@ config PINCTRL_IMX
+ 	select PINMUX
+ 	select PINCONF
+ 
++config PINCTRL_IMX1_CORE
++	bool
++	select PINMUX
++	select PINCONF
++
+ config PINCTRL_IMX35
+ 	bool "IMX35 pinctrl driver"
+ 	depends on OF
+diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
+index d64563bf..43bb05e 100644
+--- a/drivers/pinctrl/Makefile
++++ b/drivers/pinctrl/Makefile
+@@ -18,6 +18,7 @@ obj-$(CONFIG_PINCTRL_AT91)	+= pinctrl-at91.o
+ obj-$(CONFIG_PINCTRL_BCM2835)	+= pinctrl-bcm2835.o
+ obj-$(CONFIG_PINCTRL_BAYTRAIL)	+= pinctrl-baytrail.o
+ obj-$(CONFIG_PINCTRL_IMX)	+= pinctrl-imx.o
++obj-$(CONFIG_PINCTRL_IMX1_CORE)	+= pinctrl-imx1-core.o
+ obj-$(CONFIG_PINCTRL_IMX35)	+= pinctrl-imx35.o
+ obj-$(CONFIG_PINCTRL_IMX51)	+= pinctrl-imx51.o
+ obj-$(CONFIG_PINCTRL_IMX53)	+= pinctrl-imx53.o
+diff --git a/drivers/pinctrl/pinctrl-imx1-core.c b/drivers/pinctrl/pinctrl-imx1-core.c
+new file mode 100644
+index 0000000..318b976
+--- /dev/null
++++ b/drivers/pinctrl/pinctrl-imx1-core.c
+@@ -0,0 +1,667 @@
++/*
++ * Core driver for the imx pin controller in imx1/21/27
++ *
++ * Copyright (C) 2013 Pengutronix
++ * Author: Markus Pargmann <mp...@pe...>
++ *
++ * Based on pinctrl-imx.c:
++ *	Author: Dong Aisheng <don...@li...>
++ *	Copyright (C) 2012 Freescale Semiconductor, Inc.
++ *	Copyright (C) 2012 Linaro Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++
++#include <linux/err.h>
++#include <linux/init.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/pinctrl/machine.h>
++#include <linux/pinctrl/pinconf.h>
++#include <linux/pinctrl/pinctrl.h>
++#include <linux/pinctrl/pinmux.h>
++#include <linux/platform_data/gpio-mxc.h>
++#include <linux/slab.h>
++
++#include "core.h"
++#include "pinctrl-imx1.h"
++
++struct imx1_pinctrl {
++	struct device *dev;
++	struct pinctrl_dev *pctl;
++	void __iomem *base;
++	const struct imx_pinctrl_soc_info *info;
++
++	int num_gpio_childs;
++	struct platform_device **gpio_dev;
++	struct mxc_gpio_platform_data *gpio_pdata;
++};
++
++
++/*
++ * MX1 register offsets
++ */
++
++#define MX1_DDIR 0x00
++#define MX1_OCR 0x04
++#define MX1_ICONFA 0x0c
++#define MX1_ICONFB 0x10
++#define MX1_GIUS 0x20
++#define MX1_GPR 0x38
++#define MX1_PUEN 0x40
++
++/*
++ * Calculates the register offset from a pin_id
++ */
++static void __iomem *imx1_mem(struct imx1_pinctrl *ipctl, unsigned int pin_id)
++{
++	unsigned int port = pin_id / 32;
++	return ipctl->base + port * 0x100;
++}
++
++/*
++ * Write to a register with 2 bits per pin. The function will automatically
++ * use the next register if the pin is managed in the second register.
++ */
++static void imx1_write_2bit(struct imx1_pinctrl *ipctl, unsigned int pin_id,
++		u32 value, u32 reg_offset)
++{
++	void __iomem *reg = imx1_mem(ipctl, pin_id) + reg_offset;
++	int shift = (pin_id % 16) * 2;
++	int mask = ~(0x3 << shift);
++	u32 old_value;
++
++	dev_dbg(ipctl->dev, "write: register 0x%p shift %d value 0x%x\n",
++			reg, shift, value);
++
++	if (pin_id % 32 >= 16)
++		reg += 0x04;
++
++	value = (value & 0x3) << shift;
++	old_value = readl(reg) & mask;
++	writel(value | old_value, reg);
++}
++
++static void imx1_write_bit(struct imx1_pinctrl *ipctl, unsigned int pin_id,
++		u32 value, u32 reg_offset)
++{
++	void __iomem *reg = imx1_mem(ipctl, pin_id) + reg_offset;
++	int shift = pin_id % 32;
++	int mask = ~(0x1 << shift);
++	u32 old_value;
++
++	dev_dbg(ipctl->dev, "write: register 0x%p shift %d value 0x%x\n",
++			reg, shift, value);
++
++	value = (value & 0x1) << shift;
++	old_value = readl(reg) & mask;
++	writel(value | old_value, reg);
++}
++
++static int imx1_read_bit(struct imx1_pinctrl *ipctl, unsigned int pin_id,
++		u32 reg_offset)
++{
++	void __iomem *reg = imx1_mem(ipctl, pin_id) + reg_offset;
++	int shift = pin_id % 32;
++
++	return (readl(reg) >> shift) & 0x1;
++}
++
++static const inline struct imx_pin_group *imx1_pinctrl_find_group_by_name(
++				const struct imx_pinctrl_soc_info *info,
++				const char *name)
++{
++	const struct imx_pin_group *grp = NULL;
++	int i;
++
++	for (i = 0; i < info->ngroups; i++) {
++		if (!strcmp(info->groups[i].name, name)) {
++			grp = &info->groups[i];
++			break;
++		}
++	}
++
++	return grp;
++}
++
++static int imx1_get_groups_count(struct pinctrl_dev *pctldev)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++
++	return info->ngroups;
++}
++
++static const char *imx1_get_group_name(struct pinctrl_dev *pctldev,
++				       unsigned selector)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++
++	return info->groups[selector].name;
++}
++
++static int imx1_get_group_pins(struct pinctrl_dev *pctldev, unsigned selector,
++			       const unsigned **pins,
++			       unsigned *npins)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++
++	if (selector >= info->ngroups)
++		return -EINVAL;
++
++	*pins = info->groups[selector].pins;
++	*npins = info->groups[selector].npins;
++
++	return 0;
++}
++
++static void imx1_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s,
++		   unsigned offset)
++{
++	seq_printf(s, "%s", dev_name(pctldev->dev));
++}
++
++static int imx1_dt_node_to_map(struct pinctrl_dev *pctldev,
++			struct device_node *np,
++			struct pinctrl_map **map, unsigned *num_maps)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++	const struct imx_pin_group *grp;
++	struct pinctrl_map *new_map;
++	struct device_node *parent;
++	int map_num = 1;
++	int i, j;
++
++	/*
++	 * first find the group of this node and check if we need create
++	 * config maps for pins
++	 */
++	grp = imx1_pinctrl_find_group_by_name(info, np->name);
++	if (!grp) {
++		dev_err(info->dev, "unable to find group for node %s\n",
++			np->name);
++		return -EINVAL;
++	}
++
++	for (i = 0; i < grp->npins; i++)
++		map_num++;
++
++	new_map = kmalloc(sizeof(struct pinctrl_map) * map_num, GFP_KERNEL);
++	if (!new_map)
++		return -ENOMEM;
++
++	*map = new_map;
++	*num_maps = map_num;
++
++	/* create mux map */
++	parent = of_get_parent(np);
++	if (!parent) {
++		kfree(new_map);
++		return -EINVAL;
++	}
++	new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;
++	new_map[0].data.mux.function = parent->name;
++	new_map[0].data.mux.group = np->name;
++	of_node_put(parent);
++
++	/* create config map */
++	new_map++;
++	for (i = j = 0; i < grp->npins; i++) {
++		new_map[j].type = PIN_MAP_TYPE_CONFIGS_PIN;
++		new_map[j].data.configs.group_or_pin =
++				pin_get_name(pctldev, grp->pins[i]);
++		new_map[j].data.configs.configs = &grp->configs[i];
++		new_map[j].data.configs.num_configs = 1;
++		j++;
++	}
++
++	dev_dbg(pctldev->dev, "maps: function %s group %s num %d\n",
++		(*map)->data.mux.function, (*map)->data.mux.group, map_num);
++
++	return 0;
++}
++
++static void imx1_dt_free_map(struct pinctrl_dev *pctldev,
++				struct pinctrl_map *map, unsigned num_maps)
++{
++	kfree(map);
++}
++
++static const struct pinctrl_ops imx1_pctrl_ops = {
++	.get_groups_count = imx1_get_groups_count,
++	.get_group_name = imx1_get_group_name,
++	.get_group_pins = imx1_get_group_pins,
++	.pin_dbg_show = imx1_pin_dbg_show,
++	.dt_node_to_map = imx1_dt_node_to_map,
++	.dt_free_map = imx1_dt_free_map,
++
++};
++
++static int imx1_pmx_enable(struct pinctrl_dev *pctldev, unsigned selector,
++			   unsigned group)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++	const unsigned *pins, *mux;
++	unsigned int npins;
++	int i;
++
++	/*
++	 * Configure the mux mode for each pin in the group for a specific
++	 * function.
++	 */
++	pins = info->groups[group].pins;
++	npins = info->groups[group].npins;
++	mux = info->groups[group].mux_mode;
++
++	WARN_ON(!pins || !npins || !mux);
++
++	dev_dbg(ipctl->dev, "enable function %s group %s\n",
++		info->functions[selector].name, info->groups[group].name);
++
++	for (i = 0; i < npins; i++) {
++		unsigned int pin_id = pins[i];
++		unsigned int afunction = 0x001 & mux[i];
++		unsigned int gpio_in_use = (0x002 & mux[i]) >> 1;
++		unsigned int direction = (0x004 & mux[i]) >> 2;
++		unsigned int gpio_oconf = (0x030 & mux[i]) >> 4;
++		unsigned int gpio_iconfa = (0x300 & mux[i]) >> 8;
++		unsigned int gpio_iconfb = (0xc00 & mux[i]) >> 10;
++
++		dev_dbg(pctldev->dev, "%s, pin 0x%x, function %d, gpio %d, direction %d, oconf %d, iconfa %d, iconfb %d\n",
++				__func__, pin_id, afunction, gpio_in_use,
++				direction, gpio_oconf, gpio_iconfa,
++				gpio_iconfb);
++
++		imx1_write_bit(ipctl, pin_id, gpio_in_use, MX1_GIUS);
++		imx1_write_bit(ipctl, pin_id, direction, MX1_DDIR);
++
++		if (gpio_in_use) {
++			imx1_write_2bit(ipctl, pin_id, gpio_oconf, MX1_OCR);
++			imx1_write_2bit(ipctl, pin_id, gpio_iconfa,
++					MX1_ICONFA);
++			imx1_write_2bit(ipctl, pin_id, gpio_iconfb,
++					MX1_ICONFB);
++		} else {
++			imx1_write_bit(ipctl, pin_id, afunction, MX1_GPR);
++		}
++	}
++
++	return 0;
++}
++
++static int imx1_pmx_get_funcs_count(struct pinctrl_dev *pctldev)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++
++	return info->nfunctions;
++}
++
++static const char *imx1_pmx_get_func_name(struct pinctrl_dev *pctldev,
++					  unsigned selector)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++
++	return info->functions[selector].name;
++}
++
++static int imx1_pmx_get_groups(struct pinctrl_dev *pctldev, unsigned selector,
++			       const char * const **groups,
++			       unsigned * const num_groups)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++
++	*groups = info->functions[selector].groups;
++	*num_groups = info->functions[selector].num_groups;
++
++	return 0;
++}
++
++static const struct pinmux_ops imx1_pmx_ops = {
++	.get_functions_count = imx1_pmx_get_funcs_count,
++	.get_function_name = imx1_pmx_get_func_name,
++	.get_function_groups = imx1_pmx_get_groups,
++	.enable = imx1_pmx_enable,
++};
++
++static int imx1_pinconf_get(struct pinctrl_dev *pctldev,
++			     unsigned pin_id, unsigned long *config)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++
++	*config = imx1_read_bit(ipctl, pin_id, MX1_PUEN);
++
++	return 0;
++}
++
++static int imx1_pinconf_set(struct pinctrl_dev *pctldev,
++			     unsigned pin_id, unsigned long config)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++
++	imx1_write_bit(ipctl, pin_id, config & 0x01, MX1_PUEN);
++
++	dev_dbg(ipctl->dev, "pinconf set pullup pin %s\n",
++		info->pins[pin_id].name);
++
++	return 0;
++}
++
++static void imx1_pinconf_dbg_show(struct pinctrl_dev *pctldev,
++				   struct seq_file *s, unsigned pin_id)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++	const struct imx_pin_reg *pin_reg = &info->pin_regs[pin_id];
++	unsigned long config;
++
++	if (!pin_reg || !pin_reg->conf_reg) {
++		seq_puts(s, "N/A");
++		return;
++	}
++
++	config = readl(ipctl->base + pin_reg->conf_reg);
++	seq_printf(s, "0x%lx", config);
++}
++
++static void imx1_pinconf_group_dbg_show(struct pinctrl_dev *pctldev,
++					 struct seq_file *s, unsigned group)
++{
++	struct imx1_pinctrl *ipctl = pinctrl_dev_get_drvdata(pctldev);
++	const struct imx_pinctrl_soc_info *info = ipctl->info;
++	struct imx_pin_group *grp;
++	unsigned long config;
++	const char *name;
++	int i, ret;
++
++	if (group > info->ngroups)
++		return;
++
++	seq_puts(s, "\n");
++	grp = &info->groups[group];
++	for (i = 0; i < grp->npins; i++) {
++		name = pin_get_name(pctldev, grp->pins[i]);
++		ret = imx1_pinconf_get(pctldev, grp->pins[i], &config);
++		if (ret)
++			return;
++		seq_printf(s, "%s: 0x%lx", name, config);
++	}
++}
++
++static const struct pinconf_ops imx1_pinconf_ops = {
++	.pin_config_get = imx1_pinconf_get,
++	.pin_config_set = imx1_pinconf_set,
++	.pin_config_dbg_show = imx1_pinconf_dbg_show,
++	.pin_config_group_dbg_show = imx1_pinconf_group_dbg_show,
++};
++
++static struct pinctrl_desc imx1_pinctrl_desc = {
++	.pctlops = &imx1_pctrl_ops,
++	.pmxops = &imx1_pmx_ops,
++	.confops = &imx1_pinconf_ops,
++	.owner = THIS_MODULE,
++};
++
++static int imx1_pinctrl_parse_groups(struct device_node *np,
++				    struct imx_pin_group *grp,
++				    struct imx_pinctrl_soc_info *info,
++				    u32 index)
++{
++	int size;
++	const __be32 *list;
++	int i;
++	u32 config;
++
++	dev_dbg(info->dev, "group(%d): %s\n", index, np->name);
++
++	/* Initialise group */
++	grp->name = np->name;
++
++	/*
++	 * the binding format is fsl,pins = <PIN_FUNC_ID CONFIG ...>,
++	 * do sanity check and calculate pins number
++	 */
++	list = of_get_property(np, "fsl,pins", &size);
++	/* we do not check return since it's safe node passed down */
++	if (!size || size % 12) {
++		dev_notice(info->dev, "Not a valid fsl,pins property (%s)\n",
++				np->name);
++		return -EINVAL;
++	}
++
++	grp->npins = size / 12;
++	grp->pins = devm_kzalloc(info->dev, grp->npins * sizeof(unsigned int),
++				GFP_KERNEL);
++	grp->mux_mode = devm_kzalloc(info->dev,
++				grp->npins * sizeof(unsigned int), GFP_KERNEL);
++	grp->configs = devm_kzalloc(info->dev,
++				grp->npins * sizeof(unsigned long), GFP_KERNEL);
++	for (i = 0; i < grp->npins; i++) {
++		grp->pins[i] = be32_to_cpu(*list++);
++		grp->mux_mode[i] = be32_to_cpu(*list++);
++
++		config = be32_to_cpu(*list++);
++		grp->configs[i] = config;
++	}
++
++	return 0;
++}
++
++static int imx1_pinctrl_parse_functions(struct device_node *np,
++				       struct imx_pinctrl_soc_info *info,
++				       u32 index)
++{
++	struct device_node *child;
++	struct imx_pmx_func *func;
++	struct imx_pin_group *grp;
++	int ret;
++	static u32 grp_index;
++	u32 i = 0;
++
++	dev_dbg(info->dev, "parse function(%d): %s\n", index, np->name);
++
++	func = &info->functions[index];
++
++	/* Initialise function */
++	func->name = np->name;
++	func->num_groups = of_get_child_count(np);
++	if (func->num_groups <= 0)
++		return -EINVAL;
++
++	func->groups = devm_kzalloc(info->dev,
++			func->num_groups * sizeof(char *), GFP_KERNEL);
++
++	for_each_child_of_node(np, child) {
++		func->groups[i] = child->name;
++		grp = &info->groups[grp_index++];
++		ret = imx1_pinctrl_parse_groups(child, grp, info, i++);
++		if (ret)
++			return ret;
++	}
++
++	return 0;
++}
++
++static int imx1_pinctrl_parse_gpio(struct platform_device *pdev,
++		struct imx1_pinctrl *pctl, struct device_node *np, int i,
++		u32 base)
++{
++	int ret;
++	u32 memoffset;
++
++	ret = of_property_read_u32(np, "reg", &memoffset);
++	if (ret)
++		return ret;
++
++	memoffset -= base;
++	pctl->gpio_pdata[i].base = pctl->base + memoffset;
++
++	pctl->gpio_dev[i] = of_device_alloc(np, NULL, &pdev->dev);
++	pctl->gpio_dev[i]->dev.platform_data = &pctl->gpio_pdata[i];
++	pctl->gpio_dev[i]->dev.bus = &platform_bus_type;
++
++	ret = of_device_add(pctl->gpio_dev[i]);
++	if (ret) {
++		dev_err(&pdev->dev,
++				"Failed to add child gpio device\n");
++		return ret;
++	}
++	return 0;
++}
++
++static int imx1_pinctrl_parse_dt(struct platform_device *pdev,
++		struct imx1_pinctrl *pctl, struct imx_pinctrl_soc_info *info)
++{
++	struct device_node *np = pdev->dev.of_node;
++	struct device_node *child;
++	int ret;
++	u32 nfuncs = 0;
++	u32 ngpios = 0;
++	u32 ngroups = 0;
++	u32 ifunc = 0;
++	u32 igpio = 0;
++	u32 base_addr;
++
++	if (!np)
++		return -ENODEV;
++
++	ret = of_property_read_u32(np, "reg", &base_addr);
++	if (ret)
++		return ret;
++
++	for_each_child_of_node(np, child) {
++		if (!of_device_is_compatible(child, "fsl,imx21-gpio") &&
++				!of_device_is_compatible(child, "fsl,imx1-gpio")) {
++			++nfuncs;
++			ngroups += of_get_child_count(child);
++		} else if (of_device_is_available(child)) {
++			++ngpios;
++		}
++	}
++
++	if (!nfuncs && !ngpios) {
++		dev_err(&pdev->dev, "No pin functions or gpio subdevices defined\n");
++		return -EINVAL;
++	}
++
++	info->nfunctions = nfuncs;
++	info->functions = devm_kzalloc(&pdev->dev,
++			nfuncs * sizeof(struct imx_pmx_func), GFP_KERNEL);
++
++	info->ngroups = ngroups;
++	info->groups = devm_kzalloc(&pdev->dev,
++			ngroups * sizeof(struct imx_pin_group), GFP_KERNEL);
++
++	pctl->num_gpio_childs = ngpios;
++	pctl->gpio_dev = devm_kzalloc(&pdev->dev,
++			sizeof(*pctl->gpio_dev) * ngpios, GFP_KERNEL);
++	pctl->gpio_pdata = devm_kzalloc(&pdev->dev,
++			sizeof(*pctl->gpio_pdata) * ngpios, GFP_KERNEL);
++
++	if (!info->functions || !info->groups || !pctl->gpio_dev ||
++			!pctl->gpio_pdata)
++		return -ENOMEM;
++
++	for_each_child_of_node(np, child) {
++		if (!of_device_is_compatible(child, "fsl,imx21-gpio") &&
++				!of_device_is_compatible(child, "fsl,imx1-gpio")) {
++			ret = imx1_pinctrl_parse_functions(child, info,
++					ifunc++);
++			if (ret)
++				goto child_err;
++		} else if (of_device_is_available(child)) {
++			ret = imx1_pinctrl_parse_gpio(pdev, pctl, child,
++					igpio++, base_addr);
++			if (ret)
++				goto child_err;
++		}
++	}
++
++	return 0;
++child_err:
++	while (igpio--)
++		put_device(&pctl->gpio_dev[igpio]->dev);
++	return ret;
++}
++
++int imx1_pinctrl_core_probe(struct platform_device *pdev,
++		      struct imx_pinctrl_soc_info *info)
++{
++	struct imx1_pinctrl *ipctl;
++	struct resource *res;
++	struct pinctrl_desc *pctl_desc;
++	int ret;
++
++	if (!info || !info->pins || !info->npins) {
++		dev_err(&pdev->dev, "wrong pinctrl info\n");
++		return -EINVAL;
++	}
++	info->dev = &pdev->dev;
++
++	/* Create state holders etc for this driver */
++	ipctl = devm_kzalloc(&pdev->dev, sizeof(*ipctl), GFP_KERNEL);
++	if (!ipctl)
++		return -ENOMEM;
++
++	info->pin_regs = devm_kzalloc(&pdev->dev, sizeof(*info->pin_regs) *
++				      info->npins, GFP_KERNEL);
++	if (!info->pin_regs)
++		return -ENOMEM;
++
++	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
++	if (!res)
++		return -ENOENT;
++
++	ipctl->base = devm_ioremap_resource(&pdev->dev, res);
++	if (IS_ERR(ipctl->base))
++		return PTR_ERR(ipctl->base);
++
++	pctl_desc = &imx1_pinctrl_desc;
++	pctl_desc->name = dev_name(&pdev->dev);
++	pctl_desc->pins = info->pins;
++	pctl_desc->npins = info->npins;
++
++	ret = imx1_pinctrl_parse_dt(pdev, ipctl, info);
++	if (ret) {
++		dev_err(&pdev->dev, "fail to probe dt properties\n");
++		return ret;
++	}
++
++	ipctl->info = info;
++	ipctl->dev = info->dev;
++	platform_set_drvdata(pdev, ipctl);
++	ipctl->pctl = pinctrl_register(pctl_desc, &pdev->dev, ipctl);
++	if (!ipctl->pctl) {
++		dev_err(&pdev->dev, "could not register IMX pinctrl driver\n");
++		return -EINVAL;
++	}
++
++	dev_info(&pdev->dev, "initialized IMX pinctrl driver\n");
++
++	return 0;
++}
++
++int imx1_pinctrl_core_remove(struct platform_device *pdev)
++{
++	struct imx1_pinctrl *ipctl = platform_get_drvdata(pdev);
++	int i;
++
++	for (i = 0; i != ipctl->num_gpio_childs; ++i)
++		put_device(&ipctl->gpio_dev[i]->dev);
++
++	pinctrl_unregister(ipctl->pctl);
++
++	return 0;
++}
+diff --git a/drivers/pinctrl/pinctrl-imx1.h b/drivers/pinctrl/pinctrl-imx1.h
+new file mode 100644
+index 0000000..63161f1
+--- /dev/null
++++ b/drivers/pinctrl/pinctrl-imx1.h
+@@ -0,0 +1,23 @@
++/*
++ * IMX pinmux core definitions
++ *
++ * Copyright (C) 2012 Freescale Semiconductor, Inc.
++ * Copyright (C) 2012 Linaro Ltd.
++ *
++ * Author: Dong Aisheng <don...@li...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef __DRIVERS_PINCTRL_IMX1_H
++#define __DRIVERS_PINCTRL_IMX1_H
++
++#include "pinctrl-imx.h"
++
++int imx1_pinctrl_core_probe(struct platform_device *pdev,
++			struct imx_pinctrl_soc_info *info);
++int imx1_pinctrl_core_remove(struct platform_device *pdev);
++#endif /* __DRIVERS_PINCTRL_IMX1_H */
+-- 
+1.8.3.2
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+lin...@li...
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+
diff --git a/patches/linux/3.11/0206-d-linaro-imx27-pinctrl-imx27_pincontrol_driver.patch b/patches/linux/3.11/0206-d-linaro-imx27-pinctrl-imx27_pincontrol_driver.patch
new file mode 100644
index 0000000..4c110c1
--- /dev/null
+++ b/patches/linux/3.11/0206-d-linaro-imx27-pinctrl-imx27_pincontrol_driver.patch
@@ -0,0 +1,593 @@
+
+Signed-off-by: Markus Pargmann <mp...@pe...>
+---
+ .../bindings/pinctrl/fsl,imx27-pinctrl.txt         |  53 +++
+ drivers/pinctrl/Kconfig                            |   8 +
+ drivers/pinctrl/Makefile                           |   1 +
+ drivers/pinctrl/pinctrl-imx27.c                    | 477 +++++++++++++++++++++
+ 4 files changed, 539 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
+ create mode 100644 drivers/pinctrl/pinctrl-imx27.c
+
+diff --git a/Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
+new file mode 100644
+index 0000000..3352d94
+--- /dev/null
++++ b/Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
+@@ -0,0 +1,53 @@
++* Freescale IMX27 IOMUX Controller
++
++Please refer to fsl,imx-pinctrl.txt in this directory for common binding part
++and usage.
++
++The iomuxc driver node can have pin configuration and gpio subnodes. gpio
++nodes defined as childs will share the registers with the iomuxc driver.
++Please have a look into
++Documentation/devicetree/bindings/gpio/fsl-imx-gpio.txt for information about
++the gpio properties.
++
++Required properties:
++- compatible: "fsl,imx27-iomuxc"
++
++Required properties for pin configuration node:
++- fsl,pins: three integers array, represents a group of pins mux and config
++  setting. The format is fsl,pins = <PIN MUX_ID CONFIG>. PIN and MUX_ID are
++  defined as macros in arch/arm/boot/dts/imx27-pinfunc.h. CONFIG can be 0 or
++  1, meaning Pullup disable/enable.
++
++Example:
++
++iomuxc: iomuxc@10015000 {
++	compatible = "fsl,imx27-iomuxc";
++	#address-cells = <1>;
++	#size-cells = <0>;
++	reg = <0x10015000 0x600>;
++
++	gpio1: gpio@10015000 {
++		compatible = "fsl,imx27-gpio", "fsl,imx21-gpio";
++		reg = <0x10015000>;
++		interrupts = <8>;
++		gpio-controller;
++		#gpio-cells = <2>;
++		interrupt-controller;
++		#interrupt-cells = <2>;
++	};
++
++	...
++
++	uart {
++		pinctrl_uart1: uart-1 {
++			fsl,pins = <
++				MX27_PAD_UART1_TXD__UART1_TXD 0x0
++				MX27_PAD_UART1_RXD__UART1_RXD 0x0
++				MX27_PAD_UART1_CTS__UART1_CTS 0x0
++				MX27_PAD_UART1_RTS__UART1_RTS 0x0
++			>;
++		};
++
++		...
++	};
++};
+diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
+index 266a206..53fab24 100644
+--- a/drivers/pinctrl/Kconfig
++++ b/drivers/pinctrl/Kconfig
+@@ -85,6 +85,14 @@ config PINCTRL_IMX1_CORE
+ 	select PINMUX
+ 	select PINCONF
+ 
++config PINCTRL_IMX27
++	bool "IMX27 pinctrl driver"
++	depends on OF
++	depends on SOC_IMX27
++	select PINCTRL_IMX1_CORE
++	help
++	  Say Y here to enable the imx27 pinctrl driver
++
+ config PINCTRL_IMX35
+ 	bool "IMX35 pinctrl driver"
+ 	depends on OF
+diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
+index 43bb05e..d08bf87 100644
+--- a/drivers/pinctrl/Makefile
++++ b/drivers/pinctrl/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_PINCTRL_BCM2835)	+= pinctrl-bcm2835.o
+ obj-$(CONFIG_PINCTRL_BAYTRAIL)	+= pinctrl-baytrail.o
+ obj-$(CONFIG_PINCTRL_IMX)	+= pinctrl-imx.o
+ obj-$(CONFIG_PINCTRL_IMX1_CORE)	+= pinctrl-imx1-core.o
++obj-$(CONFIG_PINCTRL_IMX27)	+= pinctrl-imx27.o
+ obj-$(CONFIG_PINCTRL_IMX35)	+= pinctrl-imx35.o
+ obj-$(CONFIG_PINCTRL_IMX51)	+= pinctrl-imx51.o
+ obj-$(CONFIG_PINCTRL_IMX53)	+= pinctrl-imx53.o
+diff --git a/drivers/pinctrl/pinctrl-imx27.c b/drivers/pinctrl/pinctrl-imx27.c
+new file mode 100644
+index 0000000..aede821
+--- /dev/null
++++ b/drivers/pinctrl/pinctrl-imx27.c
+@@ -0,0 +1,477 @@
++/*
++ * imx27 pinctrl driver based on imx pinmux core
++ *
++ * Copyright (C) 2013 Pengutronix
++ *
++ * Author: Markus Pargmann <mp...@pe...>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ */
++
++#include <linux/err.h>
++#include <linux/init.h>
++#include <linux/io.h>
++#include <linux/module.h>
++#include <linux/of.h>
++#include <linux/of_device.h>
++#include <linux/pinctrl/pinctrl.h>
++
++#include "pinctrl-imx1.h"
++
++#define PAD_ID(port, pin) (port*32 + pin)
++#define PA 0
++#define PB 1
++#define PC 2
++#define PD 3
++#define PE 4
++#define PF 5
++
++enum imx27_pads {
++	MX27_PAD_USBH2_CLK = PAD_ID(PA, 0),
++	MX27_PAD_USBH2_DIR = PAD_ID(PA, 1),
++	MX27_PAD_USBH2_DATA7 = PAD_ID(PA, 2),
++	MX27_PAD_USBH2_NXT = PAD_ID(PA, 3),
++	MX27_PAD_USBH2_STP = PAD_ID(PA, 4),
++	MX27_PAD_LSCLK = PAD_ID(PA, 5),
++	MX27_PAD_LD0 = PAD_ID(PA, 6),
++	MX27_PAD_LD1 = PAD_ID(PA, 7),
++	MX27_PAD_LD2 = PAD_ID(PA, 8),
++	MX27_PAD_LD3 = PAD_ID(PA, 9),
++	MX27_PAD_LD4 = PAD_ID(PA, 10),
++	MX27_PAD_LD5 = PAD_ID(PA, 11),
++	MX27_PAD_LD6 = PAD_ID(PA, 12),
++	MX27_PAD_LD7 = PAD_ID(PA, 13),
++	MX27_PAD_LD8 = PAD_ID(PA, 14),
++	MX27_PAD_LD9 = PAD_ID(PA, 15),
++	MX27_PAD_LD10 = PAD_ID(PA, 16),
++	MX27_PAD_LD11 = PAD_ID(PA, 17),
++	MX27_PAD_LD12 = PAD_ID(PA, 18),
++	MX27_PAD_LD13 = PAD_ID(PA, 19),
++	MX27_PAD_LD14 = PAD_ID(PA, 20),
++	MX27_PAD_LD15 = PAD_ID(PA, 21),
++	MX27_PAD_LD16 = PAD_ID(PA, 22),
++	MX27_PAD_LD17 = PAD_ID(PA, 23),
++	MX27_PAD_REV = PAD_ID(PA, 24),
++	MX27_PAD_CLS = PAD_ID(PA, 25),
++	MX27_PAD_PS = PAD_ID(PA, 26),
++	MX27_PAD_SPL_SPR = PAD_ID(PA, 27),
++	MX27_PAD_HSYNC = PAD_ID(PA, 28),
++	MX27_PAD_VSYNC = PAD_ID(PA, 29),
++	MX27_PAD_CONTRAST = PAD_ID(PA, 30),
++	MX27_PAD_OE_ACD = PAD_ID(PA, 31),
++
++	MX27_PAD_UNUSED0 = PAD_ID(PB, 0),
++	MX27_PAD_UNUSED1 = PAD_ID(PB, 1),
++	MX27_PAD_UNUSED2 = PAD_ID(PB, 2),
++	MX27_PAD_UNUSED3 = PAD_ID(PB, 3),
++	MX27_PAD_SD2_D0 = PAD_ID(PB, 4),
++	MX27_PAD_SD2_D1 = PAD_ID(PB, 5),
++	MX27_PAD_SD2_D2 = PAD_ID(PB, 6),
++	MX27_PAD_SD2_D3 = PAD_ID(PB, 7),
++	MX27_PAD_SD2_CMD = PAD_ID(PB, 8),
++	MX27_PAD_SD2_CLK = PAD_ID(PB, 9),
++	MX27_PAD_CSI_D0 = PAD_ID(PB, 10),
++	MX27_PAD_CSI_D1 = PAD_ID(PB, 11),
++	MX27_PAD_CSI_D2 = PAD_ID(PB, 12),
++	MX27_PAD_CSI_D3 = PAD_ID(PB, 13),
++	MX27_PAD_CSI_D4 = PAD_ID(PB, 14),
++	MX27_PAD_CSI_MCLK = PAD_ID(PB, 15),
++	MX27_PAD_CSI_PIXCLK = PAD_ID(PB, 16),
++	MX27_PAD_CSI_D5 = PAD_ID(PB, 17),
++	MX27_PAD_CSI_D6 = PAD_ID(PB, 18),
++	MX27_PAD_CSI_D7 = PAD_ID(PB, 19),
++	MX27_PAD_CSI_VSYNC = PAD_ID(PB, 20),
++	MX27_PAD_CSI_HSYNC = PAD_ID(PB, 21),
++	MX27_PAD_USBH1_SUSP = PAD_ID(PB, 22),
++	MX27_PAD_USB_PWR = PAD_ID(PB, 23),
++	MX27_PAD_USB_OC_B = PAD_ID(PB, 24),
++	MX27_PAD_USBH1_RCV = PAD_ID(PB, 25),
++	MX27_PAD_USBH1_FS = PAD_ID(PB, 26),
++	MX27_PAD_USBH1_OE_B = PAD_ID(PB, 27),
++	MX27_PAD_USBH1_TXDM = PAD_ID(PB, 28),
++	MX27_PAD_USBH1_TXDP = PAD_ID(PB, 29),
++	MX27_PAD_USBH1_RXDM = PAD_ID(PB, 30),
++	MX27_PAD_USBH1_RXDP = PAD_ID(PB, 31),
++
++	MX27_PAD_UNUSED4 = PAD_ID(PC, 0),
++	MX27_PAD_UNUSED5 = PAD_ID(PC, 1),
++	MX27_PAD_UNUSED6 = PAD_ID(PC, 2),
++	MX27_PAD_UNUSED7 = PAD_ID(PC, 3),
++	MX27_PAD_UNUSED8 = PAD_ID(PC, 4),
++	MX27_PAD_I2C2_SDA = PAD_ID(PC, 5),
++	MX27_PAD_I2C2_SCL = PAD_ID(PC, 6),
++	MX27_PAD_USBOTG_DATA5 = PAD_ID(PC, 7),
++	MX27_PAD_USBOTG_DATA6 = PAD_ID(PC, 8),
++	MX27_PAD_USBOTG_DATA0 = PAD_ID(PC, 9),
++	MX27_PAD_USBOTG_DATA2 = PAD_ID(PC, 10),
++	MX27_PAD_USBOTG_DATA1 = PAD_ID(PC, 11),
++	MX27_PAD_USBOTG_DATA4 = PAD_ID(PC, 12),
++	MX27_PAD_USBOTG_DATA3 = PAD_ID(PC, 13),
++	MX27_PAD_TOUT = PAD_ID(PC, 14),
++	MX27_PAD_TIN = PAD_ID(PC, 15),
++	MX27_PAD_SSI4_FS = PAD_ID(PC, 16),
++	MX27_PAD_SSI4_RXDAT = PAD_ID(PC, 17),
++	MX27_PAD_SSI4_TXDAT = PAD_ID(PC, 18),
++	MX27_PAD_SSI4_CLK = PAD_ID(PC, 19),
++	MX27_PAD_SSI1_FS = PAD_ID(PC, 20),
++	MX27_PAD_SSI1_RXDAT = PAD_ID(PC, 21),
++	MX27_PAD_SSI1_TXDAT = PAD_ID(PC, 22),
++	MX27_PAD_SSI1_CLK = PAD_ID(PC, 23),
++	MX27_PAD_SSI2_FS = PAD_ID(PC, 24),
++	MX27_PAD_SSI2_RXDAT = PAD_ID(PC, 25),
++	MX27_PAD_SSI2_TXDAT = PAD_ID(PC, 26),
++	MX27_PAD_SSI2_CLK = PAD_ID(PC, 27),
++	MX27_PAD_SSI3_FS = PAD_ID(PC, 28),
++	MX27_PAD_SSI3_RXDAT = PAD_ID(PC, 29),
++	MX27_PAD_SSI3_TXDAT = PAD_ID(PC, 30),
++	MX27_PAD_SSI3_CLK = PAD_ID(PC, 31),
++
++	MX27_PAD_SD3_CMD = PAD_ID(PD, 0),
++	MX27_PAD_SD3_CLK = PAD_ID(PD, 1),
++	MX27_PAD_ATA_DATA0 = PAD_ID(PD, 2),
++	MX27_PAD_ATA_DATA1 = PAD_ID(PD, 3),
++	MX27_PAD_ATA_DATA2 = PAD_ID(PD, 4),
++	MX27_PAD_ATA_DATA3 = PAD_ID(PD, 5),
++	MX27_PAD_ATA_DATA4 = PAD_ID(PD, 6),
++	MX27_PAD_ATA_DATA5 = PAD_ID(PD, 7),
++	MX27_PAD_ATA_DATA6 = PAD_ID(PD, 8),
++	MX27_PAD_ATA_DATA7 = PAD_ID(PD, 9),
++	MX27_PAD_ATA_DATA8 = PAD_ID(PD, 10),
++	MX27_PAD_ATA_DATA9 = PAD_ID(PD, 11),
++	MX27_PAD_ATA_DATA10 = PAD_ID(PD, 12),
++	MX27_PAD_ATA_DATA11 = PAD_ID(PD, 13),
++	MX27_PAD_ATA_DATA12 = PAD_ID(PD, 14),
++	MX27_PAD_ATA_DATA13 = PAD_ID(PD, 15),
++	MX27_PAD_ATA_DATA14 = PAD_ID(PD, 16),
++	MX27_PAD_I2C_DATA = PAD_ID(PD, 17),
++	MX27_PAD_I2C_CLK = PAD_ID(PD, 18),
++	MX27_PAD_CSPI2_SS2 = PAD_ID(PD, 19),
++	MX27_PAD_CSPI2_SS1 = PAD_ID(PD, 20),
++	MX27_PAD_CSPI2_SS0 = PAD_ID(PD, 21),
++	MX27_PAD_CSPI2_SCLK = PAD_ID(PD, 22),
++	MX27_PAD_CSPI2_MISO = PAD_ID(PD, 23),
++	MX27_PAD_CSPI2_MOSI = PAD_ID(PD, 24),
++	MX27_PAD_CSPI1_RDY = PAD_ID(PD, 25),
++	MX27_PAD_CSPI1_SS2 = PAD_ID(PD, 26),
++	MX27_PAD_CSPI1_SS1 = PAD_ID(PD, 27),
++	MX27_PAD_CSPI1_SS0 = PAD_ID(PD, 28),
++	MX27_PAD_CSPI1_SCLK = PAD_ID(PD, 29),
++	MX27_PAD_CSPI1_MISO = PAD_ID(PD, 30),
++	MX27_PAD_CSPI1_MOSI = PAD_ID(PD, 31),
++
++	MX27_PAD_USBOTG_NXT = PAD_ID(PE, 0),
++	MX27_PAD_USBOTG_STP = PAD_ID(PE, 1),
++	MX27_PAD_USBOTG_DIR = PAD_ID(PE, 2),
++	MX27_PAD_UART2_CTS = PAD_ID(PE, 3),
++	MX27_PAD_UART2_RTS = PAD_ID(PE, 4),
++	MX27_PAD_PWMO = PAD_ID(PE, 5),
++	MX27_PAD_UART2_TXD = PAD_ID(PE, 6),
++	MX27_PAD_UART2_RXD = PAD_ID(PE, 7),
++	MX27_PAD_UART3_TXD = PAD_ID(PE, 8),
++	MX27_PAD_UART3_RXD = PAD_ID(PE, 9),
++	MX27_PAD_UART3_CTS = PAD_ID(PE, 10),
++	MX27_PAD_UART3_RTS = PAD_ID(PE, 11),
++	MX27_PAD_UART1_TXD = PAD_ID(PE, 12),
++	MX27_PAD_UART1_RXD = PAD_ID(PE, 13),
++	MX27_PAD_UART1_CTS = PAD_ID(PE, 14),
++	MX27_PAD_UART1_RTS = PAD_ID(PE, 15),
++	MX27_PAD_RTCK = PAD_ID(PE, 16),
++	MX27_PAD_RESET_OUT_B = PAD_ID(PE, 17),
++	MX27_PAD_SD1_D0 = PAD_ID(PE, 18),
++	MX27_PAD_SD1_D1 = PAD_ID(PE, 19),
++	MX27_PAD_SD1_D2 = PAD_ID(PE, 20),
++	MX27_PAD_SD1_D3 = PAD_ID(PE, 21),
++	MX27_PAD_SD1_CMD = PAD_ID(PE, 22),
++	MX27_PAD_SD1_CLK = PAD_ID(PE, 23),
++	MX27_PAD_USBOTG_CLK = PAD_ID(PE, 24),
++	MX27_PAD_USBOTG_DATA7 = PAD_ID(PE, 25),
++	MX27_PAD_UNUSED9 = PAD_ID(PE, 26),
++	MX27_PAD_UNUSED10 = PAD_ID(PE, 27),
++	MX27_PAD_UNUSED11 = PAD_ID(PE, 28),
++	MX27_PAD_UNUSED12 = PAD_ID(PE, 29),
++	MX27_PAD_UNUSED13 = PAD_ID(PE, 30),
++	MX27_PAD_UNUSED14 = PAD_ID(PE, 31),
++
++	MX27_PAD_NFRB = PAD_ID(PF, 0),
++	MX27_PAD_NFCLE = PAD_ID(PF, 1),
++	MX27_PAD_NFWP_B = PAD_ID(PF, 2),
++	MX27_PAD_NFCE_B = PAD_ID(PF, 3),
++	MX27_PAD_NFALE = PAD_ID(PF, 4),
++	MX27_PAD_NFRE_B = PAD_ID(PF, 5),
++	MX27_PAD_NFWE_B = PAD_ID(PF, 6),
++	MX27_PAD_PC_POE = PAD_ID(PF, 7),
++	MX27_PAD_PC_RW_B = PAD_ID(PF, 8),
++	MX27_PAD_IOIS16 = PAD_ID(PF, 9),
++	MX27_PAD_PC_RST = PAD_ID(PF, 10),
++	MX27_PAD_PC_BVD2 = PAD_ID(PF, 11),
++	MX27_PAD_PC_BVD1 = PAD_ID(PF, 12),
++	MX27_PAD_PC_VS2 = PAD_ID(PF, 13),
++	MX27_PAD_PC_VS1 = PAD_ID(PF, 14),
++	MX27_PAD_CLKO = PAD_ID(PF, 15),
++	MX27_PAD_PC_PWRON = PAD_ID(PF, 16),
++	MX27_PAD_PC_READY = PAD_ID(PF, 17),
++	MX27_PAD_PC_WAIT_B = PAD_ID(PF, 18),
++	MX27_PAD_PC_CD2_B = PAD_ID(PF, 19),
++	MX27_PAD_PC_CD1_B = PAD_ID(PF, 20),
++	MX27_PAD_CS4_B = PAD_ID(PF, 21),
++	MX27_PAD_CS5_B = PAD_ID(PF, 22),
++	MX27_PAD_ATA_DATA15 = PAD_ID(PF, 23),
++	MX27_PAD_UNUSED15 = PAD_ID(PF, 24),
++	MX27_PAD_UNUSED16 = PAD_ID(PF, 25),
++	MX27_PAD_UNUSED17 = PAD_ID(PF, 26),
++	MX27_PAD_UNUSED18 = PAD_ID(PF, 27),
++	MX27_PAD_UNUSED19 = PAD_ID(PF, 28),
++	MX27_PAD_UNUSED20 = PAD_ID(PF, 29),
++	MX27_PAD_UNUSED21 = PAD_ID(PF, 30),
++	MX27_PAD_UNUSED22 = PAD_ID(PF, 31),
++};
++
++/* Pad names for the pinmux subsystem */
++static const struct pinctrl_pin_desc imx27_pinctrl_pads[] = {
++	IMX_PINCTRL_PIN(MX27_PAD_USBH2_CLK),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH2_DIR),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH2_DATA7),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH2_NXT),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH2_STP),
++	IMX_PINCTRL_PIN(MX27_PAD_LSCLK),
++	IMX_PINCTRL_PIN(MX27_PAD_LD0),
++	IMX_PINCTRL_PIN(MX27_PAD_LD1),
++	IMX_PINCTRL_PIN(MX27_PAD_LD2),
++	IMX_PINCTRL_PIN(MX27_PAD_LD3),
++	IMX_PINCTRL_PIN(MX27_PAD_LD4),
++	IMX_PINCTRL_PIN(MX27_PAD_LD5),
++	IMX_PINCTRL_PIN(MX27_PAD_LD6),
++	IMX_PINCTRL_PIN(MX27_PAD_LD7),
++	IMX_PINCTRL_PIN(MX27_PAD_LD8),
++	IMX_PINCTRL_PIN(MX27_PAD_LD9),
++	IMX_PINCTRL_PIN(MX27_PAD_LD10),
++	IMX_PINCTRL_PIN(MX27_PAD_LD11),
++	IMX_PINCTRL_PIN(MX27_PAD_LD12),
++	IMX_PINCTRL_PIN(MX27_PAD_LD13),
++	IMX_PINCTRL_PIN(MX27_PAD_LD14),
++	IMX_PINCTRL_PIN(MX27_PAD_LD15),
++	IMX_PINCTRL_PIN(MX27_PAD_LD16),
++	IMX_PINCTRL_PIN(MX27_PAD_LD17),
++	IMX_PINCTRL_PIN(MX27_PAD_REV),
++	IMX_PINCTRL_PIN(MX27_PAD_CLS),
++	IMX_PINCTRL_PIN(MX27_PAD_PS),
++	IMX_PINCTRL_PIN(MX27_PAD_SPL_SPR),
++	IMX_PINCTRL_PIN(MX27_PAD_HSYNC),
++	IMX_PINCTRL_PIN(MX27_PAD_VSYNC),
++	IMX_PINCTRL_PIN(MX27_PAD_CONTRAST),
++	IMX_PINCTRL_PIN(MX27_PAD_OE_ACD),
++
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED0),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED1),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED2),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED3),
++	IMX_PINCTRL_PIN(MX27_PAD_SD2_D0),
++	IMX_PINCTRL_PIN(MX27_PAD_SD2_D1),
++	IMX_PINCTRL_PIN(MX27_PAD_SD2_D2),
++	IMX_PINCTRL_PIN(MX27_PAD_SD2_D3),
++	IMX_PINCTRL_PIN(MX27_PAD_SD2_CMD),
++	IMX_PINCTRL_PIN(MX27_PAD_SD2_CLK),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_D0),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_D1),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_D2),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_D3),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_D4),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_MCLK),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_PIXCLK),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_D5),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_D6),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_D7),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_VSYNC),
++	IMX_PINCTRL_PIN(MX27_PAD_CSI_HSYNC),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH1_SUSP),
++	IMX_PINCTRL_PIN(MX27_PAD_USB_PWR),
++	IMX_PINCTRL_PIN(MX27_PAD_USB_OC_B),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH1_RCV),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH1_FS),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH1_OE_B),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH1_TXDM),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH1_TXDP),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH1_RXDM),
++	IMX_PINCTRL_PIN(MX27_PAD_USBH1_RXDP),
++
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED4),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED5),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED6),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED7),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED8),
++	IMX_PINCTRL_PIN(MX27_PAD_I2C2_SDA),
++	IMX_PINCTRL_PIN(MX27_PAD_I2C2_SCL),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_DATA5),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_DATA6),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_DATA0),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_DATA2),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_DATA1),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_DATA4),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_DATA3),
++	IMX_PINCTRL_PIN(MX27_PAD_TOUT),
++	IMX_PINCTRL_PIN(MX27_PAD_TIN),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI4_FS),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI4_RXDAT),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI4_TXDAT),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI4_CLK),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI1_FS),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI1_RXDAT),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI1_TXDAT),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI1_CLK),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI2_FS),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI2_RXDAT),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI2_TXDAT),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI2_CLK),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI3_FS),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI3_RXDAT),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI3_TXDAT),
++	IMX_PINCTRL_PIN(MX27_PAD_SSI3_CLK),
++
++	IMX_PINCTRL_PIN(MX27_PAD_SD3_CMD),
++	IMX_PINCTRL_PIN(MX27_PAD_SD3_CLK),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA0),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA1),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA2),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA3),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA4),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA5),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA6),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA7),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA8),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA9),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA10),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA11),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA12),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA13),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA14),
++	IMX_PINCTRL_PIN(MX27_PAD_I2C_DATA),
++	IMX_PINCTRL_PIN(MX27_PAD_I2C_CLK),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI2_SS2),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI2_SS1),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI2_SS0),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI2_SCLK),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI2_MISO),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI2_MOSI),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI1_RDY),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI1_SS2),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI1_SS1),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI1_SS0),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI1_SCLK),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI1_MISO),
++	IMX_PINCTRL_PIN(MX27_PAD_CSPI1_MOSI),
++
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_NXT),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_STP),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_DIR),
++	IMX_PINCTRL_PIN(MX27_PAD_UART2_CTS),
++	IMX_PINCTRL_PIN(MX27_PAD_UART2_RTS),
++	IMX_PINCTRL_PIN(MX27_PAD_PWMO),
++	IMX_PINCTRL_PIN(MX27_PAD_UART2_TXD),
++	IMX_PINCTRL_PIN(MX27_PAD_UART2_RXD),
++	IMX_PINCTRL_PIN(MX27_PAD_UART3_TXD),
++	IMX_PINCTRL_PIN(MX27_PAD_UART3_RXD),
++	IMX_PINCTRL_PIN(MX27_PAD_UART3_CTS),
++	IMX_PINCTRL_PIN(MX27_PAD_UART3_RTS),
++	IMX_PINCTRL_PIN(MX27_PAD_UART1_TXD),
++	IMX_PINCTRL_PIN(MX27_PAD_UART1_RXD),
++	IMX_PINCTRL_PIN(MX27_PAD_UART1_CTS),
++	IMX_PINCTRL_PIN(MX27_PAD_UART1_RTS),
++	IMX_PINCTRL_PIN(MX27_PAD_RTCK),
++	IMX_PINCTRL_PIN(MX27_PAD_RESET_OUT_B),
++	IMX_PINCTRL_PIN(MX27_PAD_SD1_D0),
++	IMX_PINCTRL_PIN(MX27_PAD_SD1_D1),
++	IMX_PINCTRL_PIN(MX27_PAD_SD1_D2),
++	IMX_PINCTRL_PIN(MX27_PAD_SD1_D3),
++	IMX_PINCTRL_PIN(MX27_PAD_SD1_CMD),
++	IMX_PINCTRL_PIN(MX27_PAD_SD1_CLK),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_CLK),
++	IMX_PINCTRL_PIN(MX27_PAD_USBOTG_DATA7),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED9),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED10),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED11),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED12),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED13),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED14),
++
++	IMX_PINCTRL_PIN(MX27_PAD_NFRB),
++	IMX_PINCTRL_PIN(MX27_PAD_NFCLE),
++	IMX_PINCTRL_PIN(MX27_PAD_NFWP_B),
++	IMX_PINCTRL_PIN(MX27_PAD_NFCE_B),
++	IMX_PINCTRL_PIN(MX27_PAD_NFALE),
++	IMX_PINCTRL_PIN(MX27_PAD_NFRE_B),
++	IMX_PINCTRL_PIN(MX27_PAD_NFWE_B),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_POE),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_RW_B),
++	IMX_PINCTRL_PIN(MX27_PAD_IOIS16),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_RST),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_BVD2),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_BVD1),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_VS2),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_VS1),
++	IMX_PINCTRL_PIN(MX27_PAD_CLKO),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_PWRON),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_READY),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_WAIT_B),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_CD2_B),
++	IMX_PINCTRL_PIN(MX27_PAD_PC_CD1_B),
++	IMX_PINCTRL_PIN(MX27_PAD_CS4_B),
++	IMX_PINCTRL_PIN(MX27_PAD_CS5_B),
++	IMX_PINCTRL_PIN(MX27_PAD_ATA_DATA15),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED15),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED16),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED17),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED18),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED19),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED20),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED21),
++	IMX_PINCTRL_PIN(MX27_PAD_UNUSED22),
++};
++
++static struct imx_pinctrl_soc_info imx27_pinctrl_info = {
++	.pins = imx27_pinctrl_pads,
++	.npins = ARRAY_SIZE(imx27_pinctrl_pads),
++};
++
++static struct of_device_id imx27_pinctrl_of_match[] = {
++	{ .compatible = "fsl,imx27-iomuxc", },
++	{ /* sentinel */ }
++};
++
++struct imx27_pinctrl_private {
++	int num_gpio_childs;
++	struct platform_device **gpio_dev;
++	struct mxc_gpio_platform_data *gpio_pdata;
++};
++
++static int imx27_pinctrl_probe(struct platform_device *pdev)
++{
++	return imx1_pinctrl_core_probe(pdev, &imx27_pinctrl_info);
++}
++
++static struct platform_driver imx27_pinctrl_driver = {
++	.driver = {
++		.name = "imx27-pinctrl",
++		.owner = THIS_MODULE,
++		.of_match_table = of_match_ptr(imx27_pinctrl_of_match),
++	},
++	.probe = imx27_pinctrl_probe,
++	.remove = imx1_pinctrl_core_remove,
++};
++
++static int __init imx27_pinctrl_init(void)
++{
++	return platform_driver_register(&imx27_pinctrl_driver);
++}
++arch_initcall(imx27_pinctrl_init);
++
++static void __exit imx27_pinctrl_exit(void)
++{
++	platform_driver_unregister(&imx27_pinctrl_driver);
++}
++module_exit(imx27_pinctrl_exit);
++MODULE_AUTHOR("Markus Pargmann <mp...@pe...>");
++MODULE_DESCRIPTION("Freescale IMX27 pinctrl driver");
++MODULE_LICENSE("GPL v2");
+-- 
+1.8.3.2
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+lin...@li...
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
+
diff --git a/patches/linux/3.11/0206-e-linaro-imx27-dts-pin_functions.patch b/patches/linux/3.11/0206-e-linaro-imx27-dts-pin_functions.patch
new file mode 100644
index 0000000..9ba7d1a
--- /dev/null
+++ b/patches/linux/3.11/0206-e-linaro-imx27-dts-pin_functions.patch
@@ -0,0 +1,542 @@
+
+Signed-off-by: Markus Pargmann <mp...@pe...>
+---
+ arch/arm/boot/dts/imx27-pinfunc.h | 520 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 520 insertions(+)
+ create mode 100644 arch/arm/boot/dts/imx27-pinfunc.h
+
+diff --git a/arch/arm/boot/dts/imx27-pinfunc.h b/arch/arm/boot/dts/imx27-pinfunc.h
+new file mode 100644
+index 0000000..f3b4c55
+--- /dev/null
++++ b/arch/arm/boot/dts/imx27-pinfunc.h
+@@ -0,0 +1,520 @@
++/*
++ * Copyright 2013 Freescale Semiconductor, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++#ifndef __DTS_IMX27_PINFUNC_H
++#define __DTS_IMX27_PINFUNC_H
++
++/*
++ * The pin function ID is a tuple of
++ * <pin mux_config>
++ * mux_config consists of
++ * function + (direction << 2) + (gpio_oconf << 4) + (gpio_iconfa << 8) + (gpio_iconfb << 10)
++ *
++ * function:      0 - Primary function
++ *                1 - Alternate function
++ *                2 - GPIO
++ * direction:     0 - Input
++ *                1 - Output
++ * gpio_oconf:    0 - A_IN
++ *                1 - B_IN
++ *                2 - C_IN
++ *                3 - Data Register
++ * gpio_iconfa/b: 0 - GPIO_IN
++ *                1 - Interrupt Status Register
++ *                2 - 0
++ *                3 - 1
++ */
++
++#define MX27_PAD_USBH2_CLK__USBH2_CLK                      0x00 0x000
++#define MX27_PAD_USBH2_CLK__GPIO1_0                        0x00 0x036
++#define MX27_PAD_USBH2_DIR__USBH2_DIR                      0x01 0x000
++#define MX27_PAD_USBH2_DIR__GPIO1_1                        0x01 0x036
++#define MX27_PAD_USBH2_DATA7__USBH2_DATA7                  0x02 0x004
++#define MX27_PAD_USBH2_DATA7__GPIO1_2                      0x02 0x036
++#define MX27_PAD_USBH2_NXT__USBH2_NXT                      0x03 0x000
++#define MX27_PAD_USBH2_NXT__GPIO1_3                        0x03 0x036
++#define MX27_PAD_USBH2_STP__USBH2_STP                      0x04 0x004
++#define MX27_PAD_USBH2_STP__GPIO1_4                        0x04 0x036
++#define MX27_PAD_LSCLK__LSCLK                              0x05 0x004
++#define MX27_PAD_LSCLK__GPIO1_5                            0x05 0x036
++#define MX27_PAD_LD0__LD0                                  0x06 0x004
++#define MX27_PAD_LD0__GPIO1_6                              0x06 0x036
++#define MX27_PAD_LD1__LD1                                  0x07 0x004
++#define MX27_PAD_LD1__GPIO1_7                              0x07 0x036
++#define MX27_PAD_LD2__LD2                                  0x08 0x004
++#define MX27_PAD_LD2__GPIO1_8                              0x08 0x036
++#define MX27_PAD_LD3__LD3                                  0x09 0x004
++#define MX27_PAD_LD3__GPIO1_9                              0x09 0x036
++#define MX27_PAD_LD4__LD4                                  0x0a 0x004
++#define MX27_PAD_LD4__GPIO1_10                             0x0a 0x036
++#define MX27_PAD_LD5__LD5                                  0x0b 0x004
++#define MX27_PAD_LD5__GPIO1_11                             0x0b 0x036
++#define MX27_PAD_LD6__LD6                                  0x0c 0x004
++#define MX27_PAD_LD6__GPIO1_12                             0x0c 0x036
++#define MX27_PAD_LD7__LD7                                  0x0d 0x004
++#define MX27_PAD_LD7__GPIO1_13                             0x0d 0x036
++#define MX27_PAD_LD8__LD8                                  0x0e 0x004
++#define MX27_PAD_LD8__GPIO1_14                             0x0e 0x036
++#define MX27_PAD_LD9__LD9                                  0x0f 0x004
++#define MX27_PAD_LD9__GPIO1_15                             0x0f 0x036
++#define MX27_PAD_LD10__LD10                                0x10 0x004
++#define MX27_PAD_LD10__GPIO1_16                            0x10 0x036
++#define MX27_PAD_LD11__LD11                                0x11 0x004
++#define MX27_PAD_LD11__GPIO1_17                            0x11 0x036
++#define MX27_PAD_LD12__LD12                                0x12 0x004
++#define MX27_PAD_LD12__GPIO1_18                            0x12 0x036
++#define MX27_PAD_LD13__LD13                                0x13 0x004
++#define MX27_PAD_LD13__GPIO1_19                            0x13 0x036
++#define MX27_PAD_LD14__LD14                                0x14 0x004
++#define MX27_PAD_LD14__GPIO1_20                            0x14 0x036
++#define MX27_PAD_LD15__LD15                                0x15 0x004
++#define MX27_PAD_LD15__GPIO1_21                            0x15 0x036
++#define MX27_PAD_LD16__LD16                                0x16 0x004
++#define MX27_PAD_LD16__GPIO1_22                            0x16 0x036
++#define MX27_PAD_LD17__LD17                                0x17 0x004
++#define MX27_PAD_LD17__GPIO1_23                            0x17 0x036
++#define MX27_PAD_REV__REV                                  0x18 0x004
++#define MX27_PAD_REV__GPIO1_24                             0x18 0x036
++#define MX27_PAD_CLS__CLS                                  0x19 0x004
++#define MX27_PAD_CLS__GPIO1_25                             0x19 0x036
++#define MX27_PAD_PS__PS                                    0x1a 0x004
++#define MX27_PAD_PS__GPIO1_26                              0x1a 0x036
++#define MX27_PAD_SPL_SPR__SPL_SPR                          0x1b 0x004
++#define MX27_PAD_SPL_SPR__GPIO1_27                         0x1b 0x036
++#define MX27_PAD_HSYNC__HSYNC                              0x1c 0x004
++#define MX27_PAD_HSYNC__GPIO1_28                           0x1c 0x036
++#define MX27_PAD_VSYNC__VSYNC                              0x1d 0x004
++#define MX27_PAD_VSYNC__GPIO1_29                           0x1d 0x036
++#define MX27_PAD_CONTRAST__CONTRAST                        0x1e 0x004
++#define MX27_PAD_CONTRAST__GPIO1_30                        0x1e 0x036
++#define MX27_PAD_OE_ACD__OE_ACD                            0x1f 0x004
++#define MX27_PAD_OE_ACD__GPIO1_31                          0x1f 0x036
++#define MX27_PAD_UNUSED0__UNUSED0                          0x20 0x004
++#define MX27_PAD_UNUSED0__GPIO2_0                          0x20 0x036
++#define MX27_PAD_UNUSED1__UNUSED1                          0x21 0x004
++#define MX27_PAD_UNUSED1__GPIO2_1                          0x21 0x036
++#define MX27_PAD_UNUSED2__UNUSED2                          0x22 0x004
++#define MX27_PAD_UNUSED2__GPIO2_2                          0x22 0x036
++#define MX27_PAD_UNUSED3__UNUSED3                          0x23 0x004
++#define MX27_PAD_UNUSED3__GPIO2_3                          0x23 0x036
++#define MX27_PAD_SD2_D0__SD2_D0                            0x24 0x004
++#define MX27_PAD_SD2_D0__MSHC_DATA0                        0x24 0x005
++#define MX27_PAD_SD2_D0__GPIO2_4                           0x24 0x036
++#define MX27_PAD_SD2_D1__SD2_D1                            0x25 0x004
++#define MX27_PAD_SD2_D1__MSHC_DATA1                        0x25 0x005
++#define MX27_PAD_SD2_D1__GPIO2_5                           0x25 0x036
++#define MX27_PAD_SD2_D2__SD2_D2                            0x26 0x004
++#define MX27_PAD_SD2_D2__MSHC_DATA2                        0x26 0x005
++#define MX27_PAD_SD2_D2__GPIO2_6                           0x26 0x036
++#define MX27_PAD_SD2_D3__SD2_D3                            0x27 0x004
++#define MX27_PAD_SD2_D3__MSHC_DATA3                        0x27 0x005
++#define MX27_PAD_SD2_D3__GPIO2_7                           0x27 0x036
++#define MX27_PAD_SD2_CMD__SD2_CMD                          0x28 0x004
++#define MX27_PAD_SD2_CMD__MSHC_BS                          0x28 0x005
++#define MX27_PAD_SD2_CMD__GPIO2_8                          0x28 0x036
++#define MX27_PAD_SD2_CLK__SD2_CLK                          0x29 0x004
++#define MX27_PAD_SD2_CLK__MSHC_SCLK                        0x29 0x005
++#define MX27_PAD_SD2_CLK__GPIO2_9                          0x29 0x036
++#define MX27_PAD_CSI_D0__CSI_D0                            0x2a 0x000
++#define MX27_PAD_CSI_D0__UART6_TXD                         0x2a 0x005
++#define MX27_PAD_CSI_D0__GPIO2_10                          0x2a 0x036
++#define MX27_PAD_CSI_D1__CSI_D1                            0x2b 0x000
++#define MX27_PAD_CSI_D1__UART6_RXD                         0x2b 0x001
++#define MX27_PAD_CSI_D1__GPIO2_11                          0x2b 0x036
++#define MX27_PAD_CSI_D2__CSI_D2                            0x2c 0x000
++#define MX27_PAD_CSI_D2__UART6_CTS                         0x2c 0x005
++#define MX27_PAD_CSI_D2__GPIO2_12                          0x2c 0x036
++#define MX27_PAD_CSI_D3__CSI_D3                            0x2d 0x000
++#define MX27_PAD_CSI_D3__UART6_RTS                         0x2d 0x001
++#define MX27_PAD_CSI_D3__GPIO2_13                          0x2d 0x036
++#define MX27_PAD_CSI_D4__CSI_D4                            0x2e 0x000
++#define MX27_PAD_CSI_D4__GPIO2_14                          0x2e 0x036
++#define MX27_PAD_CSI_MCLK__CSI_MCLK                        0x2f 0x004
++#define MX27_PAD_CSI_MCLK__GPIO2_15                        0x2f 0x036
++#define MX27_PAD_CSI_PIXCLK__CSI_PIXCLK                    0x30 0x000
++#define MX27_PAD_CSI_PIXCLK__GPIO2_16                      0x30 0x036
++#define MX27_PAD_CSI_D5__CSI_D5                            0x31 0x000
++#define MX27_PAD_CSI_D5__GPIO2_17                          0x31 0x036
++#define MX27_PAD_CSI_D6__CSI_D6                            0x32 0x000
++#define MX27_PAD_CSI_D6__UART5_TXD                         0x32 0x005
++#define MX27_PAD_CSI_D6__GPIO2_18                          0x32 0x036
++#define MX27_PAD_CSI_D7__CSI_D7                            0x33 0x000
++#define MX27_PAD_CSI_D7__UART5_RXD                         0x33 0x001
++#define MX27_PAD_CSI_D7__GPIO2_19                          0x33 0x036
++#define MX27_PAD_CSI_VSYNC__CSI_VSYNC                      0x34 0x000
++#define MX27_PAD_CSI_VSYNC__UART5_CTS                      0x34 0x005
++#define MX27_PAD_CSI_VSYNC__GPIO2_20                       0x34 0x036
++#define MX27_PAD_CSI_HSYNC__CSI_HSYNC                      0x35 0x000
++#define MX27_PAD_CSI_HSYNC__UART5_RTS                      0x35 0x001
++#define MX27_PAD_CSI_HSYNC__GPIO2_21                       0x35 0x036
++#define MX27_PAD_USBH1_SUSP__USBH1_SUSP                    0x36 0x004
++#define MX27_PAD_USBH1_SUSP__GPIO2_22                      0x36 0x036
++#define MX27_PAD_USB_PWR__USB_PW...
 
[truncated message content]

[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-354-g89ca9b6

From: jorasse <jo...@us...> - 2013-08-06 08:50:34

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  89ca9b6f4842c5ccbef5e6315e86e7bcc6077530 (commit)
      from  9764d74f32ee8f4570affc4285bae96187f46fcf (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 89ca9b6f4842c5ccbef5e6315e86e7bcc6077530
Author: Eric Jarrige <eri...@ar...>
Date:   Tue Aug 6 10:59:26 2013 +0200

    [UBOOT] apf27: update to use external environment scripts.

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

Summary of changes:
 .../device/armadeus/apf27/apf27-u-boot-2013.04.h   |   96 ++++++--------------
 ...-add-support-for-the-armadeus-APF27-board.patch |   39 ++-------
 ...pf27-Add-FPGA-support-for-the-apf27-board.patch |   50 +++--------
 3 files changed, 46 insertions(+), 139 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 416a750..d0dce93 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
@@ -8,8 +8,8 @@
 #define __CONFIG_H
 
 #define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION	"3.3"
-#define CONFIG_IDENT_STRING	" apf27 patch 3.9"
+#define CONFIG_ENV_VERSION	10
+#define CONFIG_IDENT_STRING	" apf27 patch 3.10"
 #define CONFIG_BOARD_NAME	apf27
 
 /*
@@ -131,6 +131,7 @@
 		(CONFIG_ENV_OFFSET + CONFIG_ENV_RANGE)	/* +512kB */
 #define	CONFIG_ENV_SIZE_REDUND		CONFIG_ENV_SIZE	/* 512kB */
 #define	CONFIG_FIRMWARE_OFFSET		0x00200000
+#define	CONFIG_FIRMWARE_SIZE		0x00080000	/* 512kB  */
 #define	CONFIG_KERNEL_OFFSET		0x00300000
 #define	CONFIG_ROOTFS_OFFSET		0x00800000
 
@@ -161,6 +162,9 @@
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_HUSH_PARSER			/* enable the "hush" shell */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "	/* secondary prompt string */
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+#define CONFIG_PREBOOT			"run check_flash check_env;"
+
 
 /*
  * Boot Linux
@@ -191,51 +195,33 @@
  * Extra Environments
  */
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"env_version="		CONFIG_ENV_VERSION			"\0" \
+	"env_version="		__stringify(CONFIG_ENV_VERSION)		"\0" \
 	"consoledev="		__stringify(ACFG_CONSOLE_DEV)		"\0" \
 	"mtdparts="		MTDPARTS_DEFAULT			"\0" \
 	"partition=nand0,6\0"						\
 	"u-boot_addr="		__stringify(ACFG_MONITOR_OFFSET)	"\0" \
 	"env_addr="		__stringify(CONFIG_ENV_OFFSET)		"\0" \
 	"firmware_addr="	__stringify(CONFIG_FIRMWARE_OFFSET)	"\0" \
+	"firmware_size="	__stringify(CONFIG_FIRMWARE_SIZE)	"\0" \
 	"kernel_addr="		__stringify(CONFIG_KERNEL_OFFSET)	"\0" \
 	"rootfs_addr="		__stringify(CONFIG_ROOTFS_OFFSET)	"\0" \
+	"cpu_name=imx27"						"\0" \
 	"board_name="		__stringify(CONFIG_BOARD_NAME)		"\0" \
 	"kernel_addr_r=A0000000\0" \
-	"addnfsargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0"    \
-	"addubifsargs=setenv bootargs ${bootargs} "			\
-		"ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0"    \
-	"addmmcargs=setenv bootargs ${bootargs} "			\
-		"root=/dev/mmcblk0p1 rootfstype=ext2\0"			\
-	"addipargs=setenv bootargs ${bootargs} "			\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:"	\
-		"${hostname}:eth0:off \0"				\
-	"nfsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addnfsargs addipargs;"\
-		"nfs ${kernel_addr_r} "					\
-		"${serverip}:${rootpath}/boot/${board_name}-linux.bin;"	\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"ubifsboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs};run addubifsargs addipargs;"\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"nboot ${kernel_addr_r} kernel;"			\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"mmcboot=setenv bootargs console=${consoledev},${baudrate} "	\
-		"${mtdparts} ${extrabootargs}; run addmmcargs addipargs;"\
-		"if test -n ${fdt_addr_r}  ; then "			\
-			"nand read ${fdt_addr_r} dtb; fi;"		\
-		"mmc dev 0; ext2load mmc 0 ${kernel_addr_r}"		\
-			" /boot/${board_name}-linux.bin;"		\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"boot_nfs_fallback_flash=if ping ${serverip};"			\
-			"then echo Boot over NFS; run nfsboot;"		\
-			"else echo Boot from the board; run ubifsboot;"	\
-		"fi\0"							\
-	"firmware_autoload=0\0"						\
+	"check_env=if test -n ${flash_env_version}; "			\
+		"then env default env_version; "			\
+		"else env set flash_env_version ${env_version}; env save; "\
+		"fi; "							\
+		"if itest ${flash_env_version} < ${env_version}; then " \
+			"echo \"*** Warning - Environment version"	\
+			" change suggests: run flash_reset_env; reset\"; "\
+			"env default flash_reset_env; "\
+		"fi; \0"						\
+	"check_flash=nand lock; nand unlock ${env_addr}; \0"	\
+	"flash_reset_env=env default -f -a; saveenv; run update_env;"	\
+		"echo Flash environment variables erased!\0"		\
+	"download_uboot=tftpboot ${loadaddr} ${board_name}"		\
+		"-u-boot-nand.bin\0"				\
 	"flash_uboot=nand unlock ${u-boot_addr} ;"			\
 		"nand erase.part u-boot;"		\
 		"if nand write.trimffs ${fileaddr} ${u-boot_addr} ${filesize};"\
@@ -243,38 +229,12 @@
 				"echo Flashing of uboot succeed;"	\
 			"else echo Flashing of uboot failed;"		\
 		"fi; \0"						\
-	"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\0"							\
-	"flash_kernel=nand erase.part kernel;"				\
-		"if nand write.trimffs ${fileaddr} ${kernel_addr} ${filesize};"\
-			"then echo Flashing of kernel succeed;"		\
-			"else echo Flashing of kernel failed;"		\
-		"fi\0"							\
-	"flash_rootfs=nand erase.part rootfs;"	\
-		"if nand write.trimffs ${fileaddr} ${rootfs_addr} ${filesize};"\
-			"then echo Flashing of rootfs succeed;"		\
-			"else echo Flashing of rootfs failed;"		\
-		"fi\0"							\
-	"flash_dtb=nand erase.part dtb;"				\
-		"if nand write.trimffs ${fileaddr} dtb ${filesize};"	\
-			"then echo Flashing of rootfs succeed;"		\
-			"else echo Flashing of rootfs failed;"		\
-		"fi\0"							\
-	"flash_reset_env=env default -f -a; saveenv;"			\
-		"echo Flash environment variables erased!\0"		\
-	"download_uboot=tftpboot ${loadaddr} ${board_name}-u-boot-nand.bin\0" \
-	"download_kernel=tftpboot ${loadaddr} ${board_name}-linux.bin\0" \
-	"download_rootfs=tftpboot ${loadaddr} ${board_name}-rootfs.ubi\0" \
-	"download_dtb=tftpboot ${loadaddr} imx27-${board_name}.dtb\0" \
 	"update_uboot=run download_uboot flash_uboot\0"			\
-	"update_kernel=run download_kernel flash_kernel\0"		\
-	"update_rootfs=run download_rootfs flash_rootfs\0"		\
-	"update_dtb=run download_dtb flash_dtb\0"		\
-	"update_all=run download_kernel flash_kernel download_rootfs "	\
-		"flash_rootfs download_uboot flash_uboot\0"		\
+	"download_env=tftpboot ${loadaddr} ${board_name}"		\
+		"-u-boot-env.txt\0"				\
+	"flash_env=env import -t ${loadaddr}; env save; \0"		\
+	"update_env=run download_env flash_env\0"			\
+	"update_all=run update_env update_uboot\0"			\
 	"unlock_regs=mw 10000008 0; mw 10020008 0\0"			\
 
 /*
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 b99faaf..e39cb12 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,356 @@
+@@ -0,0 +1,329 @@
 +/*
 + * Copyright (C) 2007 Sascha Hauer, Pengutronix
 + * Copyright (C) 2008-2012 Eric Jarrige <eri...@ar...>
@@ -408,38 +408,11 @@ index 0000000..fce3325
 + */
 +int misc_init_r(void)
 +{
-+	char *s;
-+	u_char *firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR +
-+					      CONFIG_SYS_MONITOR_LEN);
-+	size_t size	= 0;
-+	size_t offset	= -1;
-+#if defined(CONFIG_FPGA)
-+	char *autoload = getenv("firmware_autoload");
-+#endif
-+	u8 pnum;
-+	struct mtd_device *dev;
-+	struct part_info *part;
-+
-+	/* detect compatibility issue of environment version */
-+	s = getenv("env_version");
-+	if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
-+		char *const vars[] = {"flash_reset_env"};
-+		printf("*** Warning - Environment version change suggests: ");
-+		printf("run flash_reset_env; reset\n");
-+		set_default_vars(1, vars);
-+	}
-+
-+	/* Unlock whole flash but U-Boot */
-+	if (mtdparts_init() == 0) {
-+		if (find_dev_and_part("u-boot",
-+				      &dev, &pnum, &part) == 0) {
-+			offset = part->size;
-+		}
-+	}
-+
-+	if (nand_unlock(&nand_info[0], offset, nand_info[0].size - offset, 0))
-+		printf("NAND flash lock/unlocked failed\n");
-+
++	/* create or delete environment variable if CTRL-C is pressed or not.*/
++	if (ctrlc())
++		setenv ("had_ctrlc", "1");
++	else
++		setenv ("had_ctrlc", "");
 +
 +	return 0;
 +}
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 9bc8a89..0948b61 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
@@ -37,36 +37,23 @@ index fce3325..951a5e3 100644
  
  DECLARE_GLOBAL_DATA_PTR;
  
-@@ -321,6 +322,23 @@ int misc_init_r(void)
- 	struct mtd_device *dev;
- 	struct part_info *part;
+@@ -321,6 +322,10 @@ int misc_init_r(void)
+ 	else
+ 		setenv ("had_ctrlc", "");
  
 +#if defined(CONFIG_FPGA)
-+	/* init and download fpga */
-+	if ((autoload) && (0 == strcmp(autoload, "1"))) {
-+		if (mtdparts_init() == 0)
-+			if (find_dev_and_part("firmware",
-+					      &dev, &pnum, &part) == 0) {
-+				size = part->size;
-+				if (nand_read_skip_bad(&nand_info[0],
-+						       part->offset, &size,
-+						       NULL, part->size,
-+						       firmware_buffer))
-+					size = 0;
-+			}
-+	}
-+	APF27_init_fpga(firmware_buffer, size);
++	APF27_init_fpga();
 +#endif
 +
- 	/* detect compatibility issue of environment version */
- 	s = getenv("env_version");
- 	if ((NULL == s) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
+ 	return 0;
+ }
+ 
 diff --git a/board/armadeus/apf27/fpga.c b/board/armadeus/apf27/fpga.c
 new file mode 100644
 index 0000000..47f4ffc
 --- /dev/null
 +++ b/board/armadeus/apf27/fpga.c
-@@ -0,0 +1,250 @@
+@@ -0,0 +1,237 @@
 +/*
 + * (C) Copyright 2002-2012
 + * Eric Jarrige <eri...@ar...>
@@ -289,11 +276,9 @@ index 0000000..47f4ffc
 +/*
 + * Initialize the fpga.  Return 1 on success, 0 on failure.
 + */
-+int APF27_init_fpga(u_char *buffer, size_t size)
++void APF27_init_fpga(void)
 +{
-+	char *autoload = getenv("firmware_autoload");
-+
-+	int i, lout = 0;
++	int i;
 +
 +	apf27_fpga_setup();
 +
@@ -304,18 +289,7 @@ index 0000000..47f4ffc
 +		fpga_add(fpga_xilinx, &fpga[i]);
 +	}
 +
-+	if ((size >= fpga[0].size) && (autoload) &&
-+	    (0 == strcmp(autoload, "1"))) {
-+		if (ctrlc()) {
-+			printf("Firmware download stopped!\n");
-+		} else if (FPGA_SUCCESS != fpga_load(0, (void *)buffer, size)) {
-+			printf("Firmware download failed!\n");
-+		} else {
-+			printf("Firmware successfully programmed\n");
-+			lout = 1;
-+		}
-+	}
-+	return lout;
++	return;
 +}
 diff --git a/board/armadeus/apf27/fpga.h b/board/armadeus/apf27/fpga.h
 new file mode 100644
@@ -348,7 +322,7 @@ index 0000000..e30dd11
 + * MA 02111-1307 USA
 + *
 + */
-+extern int APF27_init_fpga(u_char *buffer, size_t size);
++extern void APF27_init_fpga(void);
 +
 +extern int fpga_pre_fn(int cookie);
 +extern int fpga_pgm_fn(int assert_pgm, int flush, int cookie);


hooks/post-receive
-- 
armadeus

Flat | Threaded

<< < 1 .. 56 57 58 59 60 .. 153 > >> (Page 58 of 153)