armadeus-commitlog Mailing List for armadeus (Page 101)
Brought to you by:
sszy
Menu
▾
▴
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
|
|
From: jscheer <js...@us...> - 2010-12-03 09:01:20
|
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 c0ff4d1a914607a628db6bdd4caea35363c229f4 (commit)
from 34221c1c08a8b6cbdf2c7986eb663436cccea83f (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 c0ff4d1a914607a628db6bdd4caea35363c229f4
Author: Jeremie Scheer <jer...@ar...>
Date: Fri Dec 3 10:00:56 2010 +0100
[ROOTFS] Add the gpio init file S80gpios to the rootfs when compiling a PPS board. Corrects bugs with ethernet SMSC and WPA Supplicant
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/pps/pps.mk | 13 +++-
.../pps/configs/{ => wpa_supplicant}/networkConfig | 0
target/pps/init/S80gpios | 76 ++++++++++++++++++++
3 files changed, 85 insertions(+), 4 deletions(-)
rename target/pps/configs/{ => wpa_supplicant}/networkConfig (100%)
create mode 100755 target/pps/init/S80gpios
diff --git a/buildroot/package/armadeus/pps/pps.mk b/buildroot/package/armadeus/pps/pps.mk
index 7df17a4..2642e8e 100644
--- a/buildroot/package/armadeus/pps/pps.mk
+++ b/buildroot/package/armadeus/pps/pps.mk
@@ -9,7 +9,9 @@ ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR:=$(TARGET_DIR)/usr/local/pps/scripts
ARMADEUS-PPS_WWW_DIR:=$(TOPDIR)/../target/pps/www
ARMADEUS-PPS_WWW_TARGET_DIR:=$(TARGET_DIR)/var
ARMADEUS-PPS_CONFIGS_DIR:=$(TOPDIR)/../target/pps/configs
-ARMADEUS-PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/wpa_supplicant
+ARMADEUS-PPS_CONFIGS_TARGET_DIR:=$(TARGET_DIR)/etc/
+ARMADEUS-PPS_INITS_DIR:=$(TOPDIR)/../target/pps/init
+ARMADEUS-PPS_INITS_TARGET_DIR:=$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/init.d
$(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh:
$(ARMADEUS-PPS_TESTSCRIPTS_SOURCE)/install.sh $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
@@ -17,11 +19,14 @@ $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh:
$(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html:
cp -Rf $(ARMADEUS-PPS_WWW_DIR) $(ARMADEUS-PPS_WWW_TARGET_DIR)
-$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig:
+$(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/wpa_supplicant/networkConfig:
mkdir -p $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
- cp -f $(ARMADEUS-PPS_CONFIGS_DIR)/* $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
+ cp -Rf $(ARMADEUS-PPS_CONFIGS_DIR)/* $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)
-pps-testscripts: $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/networkConfig
+$(ARMADEUS-PPS_INITS_TARGET_DIR)/S80gpios:
+ cp -Rf $(ARMADEUS-PPS_INITS_DIR)/* $(ARMADEUS-PPS_INITS_TARGET_DIR)
+
+pps-testscripts: $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)/init_boa.sh $(ARMADEUS-PPS_WWW_TARGET_DIR)/www/index.html $(ARMADEUS-PPS_CONFIGS_TARGET_DIR)/wpa_supplicant/networkConfig $(ARMADEUS-PPS_INITS_TARGET_DIR)/S80gpios
armadeus-pps-testscripts-clean:
rm -rf $(ARMADEUS-PPS_TESTSCRIPTS_TARGET_DIR)
diff --git a/target/pps/configs/networkConfig b/target/pps/configs/wpa_supplicant/networkConfig
similarity index 100%
rename from target/pps/configs/networkConfig
rename to target/pps/configs/wpa_supplicant/networkConfig
diff --git a/target/pps/init/S80gpios b/target/pps/init/S80gpios
new file mode 100755
index 0000000..bf33950
--- /dev/null
+++ b/target/pps/init/S80gpios
@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+# Script used to configure user space usable GPIOs on PPS
+#
+# Julien Boibessot <jul...@ar...>
+# Fabien Marteau <fab...@ar...>
+#
+
+GPIO_DEV_DIR=/dev/gpio
+
+setbit()
+{
+ PORT=$1
+ NB=$2
+ VAL=$3
+ cat $PORT | sed "s/[0-1]\([0-1]\{$NB\}\)$/$VAL\1/" > $PORT
+}
+
+gpio_set_value()
+{
+ GPIO=$1
+ VALUE=$2
+ if [ "$VALUE" == "1" ]; then
+ echo -ne "\x01" > $GPIO_DEV_DIR/$GPIO
+ else
+ echo -ne "\x00" > $GPIO_DEV_DIR/$GPIO
+ fi
+}
+
+# Sets $1 as GPIO; $2 == 1 -> outpout, 0 -> input
+gpio_mode()
+{
+ GPIO=`echo $1 | cut -c 3-4`
+ VALUE=$2
+ PORT=`echo $1 | cut -c 2`
+ PORT_DIR="/proc/driver/gpio/port"$PORT"dir"
+ PORT_MODE="/proc/driver/gpio/port"$PORT"mode"
+
+ setbit $PORT_MODE $GPIO 1
+ setbit $PORT_DIR $GPIO $VALUE
+}
+
+case "$1" in
+ start)
+ echo "Configuring PPS GPIOs"
+ /usr/bin/loadgpio.sh
+
+ # Status leds
+ gpio_mode PF16 1
+ gpio_set_value PF16 1 #STATUS_LED0 (green) on
+ # Status leds
+ gpio_mode PF17 1
+ gpio_set_value PF17 0 #STATUS_LED1 (red) off
+
+ # Second eth
+ gpio_mode PC15 1
+ gpio_set_value PC15 1 #LAN9500_RESETN
+
+ ;;
+ stop)
+ gpio_set_value PF16 0 #STATUS_LED0 (green) off
+ gpio_set_value PF17 1 #STATUS_LED1 (red) off
+ gpio_set_value PC15 0 #LAN9500_RESETN
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart}"
+ exit 1
+ ;;
+esac
+
+exit 0
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-12-01 17:56:19
|
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 34221c1c08a8b6cbdf2c7986eb663436cccea83f (commit)
from 9b6b500b51a910037532f8f8614b4a80ace307b8 (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 34221c1c08a8b6cbdf2c7986eb663436cccea83f
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 1 18:55:37 2010 +0100
[LINUX] 2.6.36: Add USBH2 support and APF51Dev (preliminary) support. Update default APF51 config accordingly
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.36.config | 34 ++++-
.../2.6.36/400-armadeus-add_apf51_module.patch | 75 +++++++++--
...deus-iomux-mx51-add_USBH2_pins_definition.patch | 56 ++++++++
...ct_some_mx5_regiter_settings_and_comments.patch | 30 +++++
...-mx5-devices-add_USBH2_to_list_of_devices.patch | 135 ++++++++++++++++++++
.../408-armadeus-add_apf51-dev_baseboard.patch | 99 ++++++++++++++
6 files changed, 410 insertions(+), 19 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/408-armadeus-add_apf51-dev_baseboard.patch
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
index 23dfcd1..3c76717 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36
-# Wed Nov 3 19:41:42 2010
+# Wed Dec 1 17:27:05 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -247,11 +247,14 @@ CONFIG_ARCH_MX51=y
# CONFIG_MACH_MX51_BABBAGE is not set
# CONFIG_MACH_MX51_3DS is not set
# CONFIG_MACH_EUKREA_CPUIMX51 is not set
-CONFIG_MACH_ARMADEUS_APF51=y
+CONFIG_MACH_APF51=y
+CONFIG_MACH_APF51_HAS_BASEBOARD=y
+CONFIG_MACH_APF51_DEV=y
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_TZIC=y
# CONFIG_MXC_PWM is not set
# CONFIG_MXC_DEBUG_BOARD is not set
+CONFIG_MXC_ULPI=y
CONFIG_ARCH_MXC_IOMUX_V3=y
#
@@ -749,9 +752,29 @@ CONFIG_NETDEVICES=y
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+CONFIG_SMSC_PHY=y
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
+CONFIG_MII=y
# CONFIG_AX88796 is not set
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
@@ -770,7 +793,8 @@ CONFIG_NET_ETHERNET=y
# CONFIG_B44 is not set
# CONFIG_KS8851 is not set
# CONFIG_KS8851_MLL is not set
-# CONFIG_FEC is not set
+CONFIG_FEC=y
+# CONFIG_FEC2 is not set
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_WLAN=y
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
index d18ff91..8177b57 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
@@ -1,12 +1,12 @@
Index: linux-2.6.36/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.36.orig/arch/arm/mach-mx5/Kconfig 2010-11-30 16:25:47.000000000 +0100
-+++ linux-2.6.36/arch/arm/mach-mx5/Kconfig 2010-11-30 16:25:56.000000000 +0100
+--- linux-2.6.36.orig/arch/arm/mach-mx5/Kconfig 2010-11-30 17:32:17.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-mx5/Kconfig 2010-12-01 15:43:11.000000000 +0100
@@ -42,4 +42,11 @@
endchoice
-+config MACH_ARMADEUS_APF51
++config MACH_APF51
+ bool "Support Armadeus APF51"
+ select MXC_ULPI
+ help
@@ -16,18 +16,18 @@ Index: linux-2.6.36/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.36/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.36.orig/arch/arm/mach-mx5/Makefile 2010-11-30 16:25:47.000000000 +0100
-+++ linux-2.6.36/arch/arm/mach-mx5/Makefile 2010-11-30 16:25:56.000000000 +0100
+--- linux-2.6.36.orig/arch/arm/mach-mx5/Makefile 2010-11-30 17:32:17.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-mx5/Makefile 2010-12-01 15:43:11.000000000 +0100
@@ -9,3 +9,4 @@
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
-+obj-$(CONFIG_MACH_ARMADEUS_APF51) += board-apf51.o
++obj-$(CONFIG_MACH_APF51) += board-apf51.o
Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-mx5/board-apf51.c 2010-11-30 16:32:59.000000000 +0100
-@@ -0,0 +1,301 @@
++++ linux-2.6.36/arch/arm/mach-mx5/board-apf51.c 2010-12-01 15:45:20.000000000 +0100
+@@ -0,0 +1,348 @@
+/*
+ * Copyright 2010 Armadeus Systems
+ *
@@ -62,9 +62,12 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+
+#include "devices.h"
+
++extern void apf51_baseboard_init(void);
++
+/* USB_CTRL_1 */
+#define MX51_USB_CTRL_1_OFFSET 0x10
+#define MX51_USB_CTRL_UH1_EXT_CLK_EN (1 << 25)
++#define MX51_USB_CTRL_UH2_EXT_CLK_EN (1 << 26)
+
+
+static struct pad_desc apf51_pads[] = {
@@ -87,6 +90,18 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+ MX51_PAD_USBH1_STP__USBH1_STP,
+
+ /* USB HOST2 */
++ MX51_PAD_EIM_A24__USBH2_CLK,
++ MX51_PAD_EIM_A25__USBH2_DIR,
++ MX51_PAD_EIM_A26__USBH2_STP,
++ MX51_PAD_EIM_A27__USBH2_NXT,
++ MX51_PAD_EIM_D16__USBH2_DATA0,
++ MX51_PAD_EIM_D17__USBH2_DATA1,
++ MX51_PAD_EIM_D18__USBH2_DATA2,
++ MX51_PAD_EIM_D19__USBH2_DATA3,
++ MX51_PAD_EIM_D20__USBH2_DATA4,
++ MX51_PAD_EIM_D21__USBH2_DATA5,
++ MX51_PAD_EIM_D22__USBH2_DATA6,
++ MX51_PAD_EIM_D23__USBH2_DATA7,
+
+ /* Debug PINS */
+/* MX51_PAD_GPIO_1_2__GPIO_1_2,
@@ -144,6 +159,23 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+ return 0;
+}
+
++static int initialize_usbh2_port(struct platform_device *pdev)
++{
++ u32 v;
++ void __iomem *usb_base;
++ u32 usbother_base;
++
++ usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
++ usbother_base = (u32)(usb_base + MX5_USBOTHER_REGS_OFFSET);
++
++ /* The clock for the USBH2 ULPI port will come externally from the PHY. */
++ v = __raw_readl(usbother_base + MX51_USB_CTRL_1_OFFSET);
++ __raw_writel(v | MX51_USB_CTRL_UH2_EXT_CLK_EN, usbother_base + MX51_USB_CTRL_1_OFFSET);
++ iounmap(usb_base);
++
++ return 0;
++}
++
+/* ULPI register addresses */
+#define ULPI_VID_LOW 0x00 /* Vendor ID low */
+#define ULPI_VID_HIGH 0x01 /* Vendor ID high */
@@ -180,7 +212,7 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+ pid = otg->io_ops->read(otg, ULPI_PID_HIGH) << 8;
+ pid = pid | otg->io_ops->read(otg, ULPI_PID_LOW);
+
-+ pr_info("ULPI OTG Vendor ID 0x%x Product ID 0x%x\n", vid, pid);
++ pr_info("ULPI OTG (%s) Vendor ID 0x%x Product ID 0x%x\n", otg->label, vid, pid);
+ if (vid != 0x424 || pid != 0x07) {
+ pr_err("No USB3320 found\n");
+ return -1;
@@ -241,10 +273,24 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+ .otg = &usb3320_1,
+};
+
++/* ?? Preferably use otg_ulpi_create from drivers/usb/otg/ulpi.c ?? */
++struct otg_transceiver usb3320_2 = {
++ .io_ops = &mxc_ulpi_access_ops,
++ .init = usb3320_init,
++ .set_vbus = usb3320_set_vbus,
++};
++
++static struct mxc_usbh_platform_data usbh2_config = {
++ .init = initialize_usbh2_port,
++ .portsc = MXC_EHCI_MODE_ULPI,
++ .flags = (MXC_EHCI_POWER_PINS_ENABLED | MXC_EHCI_ITC_NO_THRESHOLD),
++ .otg = &usb3320_2,
++};
++
+#define APF51_USBH1_STP (0*32 + 27) /* GPIO_1_27 */
+#define APF51_USB_HOST_PHY_RESET (2*32 +1) /* GPIO_3_1 */
+
-+static int apf51_usbh1_active(void)
++static int apf51_usbh1_usbh2_active(void)
+{
+ struct pad_desc phyreset_gpio = MX51_PAD_DI1_PIN12__GPIO_3_1;
+ int ret;
@@ -301,10 +347,11 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+ mxc_register_device(&mxc_nand_device, &apf51_nand_board_info);
+ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
+
-+ apf51_usbh1_active();
++ apf51_usbh1_usbh2_active();
+ mxc_register_device(&mxc_usbh1_device, &usbh1_config);
++ mxc_register_device(&mxc_usbh2_device, &usbh2_config);
+
-+#ifdef CONFIG_MACH_ARMADEUS_APF51_BASEBOARD
++#ifdef CONFIG_MACH_APF51_HAS_BASEBOARD
+ apf51_baseboard_init();
+#endif
+}
@@ -331,8 +378,8 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+
Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-30 16:25:55.000000000 +0100
-+++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-30 16:25:56.000000000 +0100
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-30 17:32:23.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-30 17:32:24.000000000 +0100
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch
new file mode 100644
index 0000000..01c233d
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch
@@ -0,0 +1,56 @@
+Declare USBH2 pins in IOMUX.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/iomux-mx51.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/iomux-mx51.h 2010-11-30 18:13:14.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/iomux-mx51.h 2010-11-30 19:09:13.000000000 +0100
+@@ -43,6 +43,7 @@
+ #define MX51_USBH1_PAD_CTRL (PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \
+ PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \
+ PAD_CTL_PKE | PAD_CTL_HYS)
++#define MX51_USBH2_PAD_CTRL MX51_USBH1_PAD_CTRL
+ #define MX51_GPIO_PAD_CTRL (PAD_CTL_DSE_HIGH | PAD_CTL_PKE | \
+ PAD_CTL_SRE_FAST)
+
+@@ -70,17 +71,25 @@
+ #define MX51_PAD_EIM_DA14__EIM_DA14 IOMUX_PAD(0x7bc, 0x054, 0, 0x0, 0, NO_PAD_CTRL)
+ #define MX51_PAD_EIM_DA15__EIM_DA15 IOMUX_PAD(0x7bc, 0x058, 0, 0x0, 0, NO_PAD_CTRL)
+ #define MX51_PAD_EIM_D16__GPIO_2_0 IOMUX_PAD(0x3f0, 0x05c, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_D16__USBH2_DATA0 IOMUX_PAD(0x3f0, 0x05c, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_D16__I2C1_SDA IOMUX_PAD(0x3f0, 0x05c, (4 | IOMUX_CONFIG_SION), \
+ 0x09b4, 0, MX51_I2C_PAD_CTRL)
+ #define MX51_PAD_EIM_D17__GPIO_2_1 IOMUX_PAD(0x3f4, 0x060, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_D17__USBH2_DATA1 IOMUX_PAD(0x3f4, 0x060, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_D18__GPIO_2_2 IOMUX_PAD(0x3f8, 0x064, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_D18__USBH2_DATA2 IOMUX_PAD(0x3f8, 0x064, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_D19__GPIO_2_3 IOMUX_PAD(0x3fc, 0x068, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_D19__USBH2_DATA3 IOMUX_PAD(0x3fc, 0x068, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_D19__I2C1_SCL IOMUX_PAD(0x3fc, 0x068, (4 | IOMUX_CONFIG_SION), \
+ 0x09b0, 0, MX51_I2C_PAD_CTRL)
+ #define MX51_PAD_EIM_D20__GPIO_2_4 IOMUX_PAD(0x400, 0x06c, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_D20__USBH2_DATA4 IOMUX_PAD(0x400, 0x06c, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_D21__GPIO_2_5 IOMUX_PAD(0x404, 0x070, 1, 0x0, 0, MX51_GPIO_PAD_CTRL)
++#define MX51_PAD_EIM_D21__USBH2_DATA5 IOMUX_PAD(0x404, 0x070, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_D22__GPIO_2_6 IOMUX_PAD(0x408, 0x074, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_D22__USBH2_DATA6 IOMUX_PAD(0x408, 0x074, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_D23__GPIO_2_7 IOMUX_PAD(0x40c, 0x078, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_D23__USBH2_DATA7 IOMUX_PAD(0x40c, 0x078, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_D24__UART3_CTS IOMUX_PAD(0x410, 0x07c, 3, 0x0, 0, MX51_UART3_PAD_CTRL)
+ #define MX51_PAD_EIM_D25__UART3_RXD IOMUX_PAD(0x414, 0x080, 3, 0x9f4, 0, MX51_UART3_PAD_CTRL)
+ #define MX51_PAD_EIM_D25__UART2_CTS IOMUX_PAD(0x414, 0x080, 4, 0x0, 0, MX51_UART2_PAD_CTRL)
+@@ -100,9 +109,13 @@
+ #define MX51_PAD_EIM_A22__GPIO_2_16 IOMUX_PAD(0x448, 0x0b4, 1, 0x0, 0, NO_PAD_CTRL)
+ #define MX51_PAD_EIM_A23__GPIO_2_17 IOMUX_PAD(0x44c, 0x0b8, 1, 0x0, 0, NO_PAD_CTRL)
+ #define MX51_PAD_EIM_A24__GPIO_2_18 IOMUX_PAD(0x450, 0x0bc, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_A24__USBH2_CLK IOMUX_PAD(0x450, 0x0bc, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_A25__GPIO_2_19 IOMUX_PAD(0x454, 0x0c0, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_A25__USBH2_DIR IOMUX_PAD(0x454, 0x0c0, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_A26__GPIO_2_20 IOMUX_PAD(0x458, 0x0c4, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_A26__USBH2_STP IOMUX_PAD(0x458, 0x0c4, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_A27__GPIO_2_21 IOMUX_PAD(0x45c, 0x0c8, 1, 0x0, 0, NO_PAD_CTRL)
++#define MX51_PAD_EIM_A27__USBH2_NXT IOMUX_PAD(0x45c, 0x0c8, 2, 0x0, 0, MX51_USBH2_PAD_CTRL)
+ #define MX51_PAD_EIM_EB0__EIM_EB0 IOMUX_PAD(0x460, 0x0cc, 0, 0x0, 0, NO_PAD_CTRL)
+ #define MX51_PAD_EIM_EB1__EIM_EB1 IOMUX_PAD(0x464, 0x0d0, 0, 0x0, 0, NO_PAD_CTRL)
+ #define MX51_PAD_EIM_EB2__GPIO_2_22 IOMUX_PAD(0x468, 0x0d4, 1, 0x0, 0, NO_PAD_CTRL)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch
new file mode 100644
index 0000000..aacf45e
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch
@@ -0,0 +1,30 @@
+Some HOST1 registers bits seem to be misused. Corresponding comments seem also
+false. Correct that.
+
+Strange that with or without this changes HOST1 seems to work the same way...
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/ehci.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/ehci.c 2010-12-01 16:49:46.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/ehci.c 2010-12-01 17:20:20.000000000 +0100
+@@ -292,14 +292,14 @@
+ /*Host ULPI */
+ v = __raw_readl(usbother_base + MXC_USBCTRL_OFFSET);
+ if (flags & MXC_EHCI_WAKEUP_ENABLED)
+- v &= ~(MXC_H1_UCTRL_H1WIE_BIT | MXC_H1_UCTRL_H1UIE_BIT);/* HOST1 wakeup/ULPI intr disable */
++ v |= (MXC_H1_UCTRL_H1WIE_BIT | MXC_H1_UCTRL_H1UIE_BIT);/* HOST1 wakeup/ULPI intr enabled */
+ else
+- v &= ~(MXC_H1_UCTRL_H1WIE_BIT | MXC_H1_UCTRL_H1UIE_BIT);/* HOST1 wakeup/ULPI intr disable */
++ v &= ~(MXC_H1_UCTRL_H1WIE_BIT | MXC_H1_UCTRL_H1UIE_BIT);/* HOST1 wakeup/ULPI intr disabled */
+
+ if (flags & MXC_EHCI_POWER_PINS_ENABLED)
+- v &= ~MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask used*/
++ v |= MXC_H1_UCTRL_H1PM_BIT; /* USBPWR pin used */
+ else
+- v |= MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask used*/
++ v &= ~MXC_H1_UCTRL_H1PM_BIT; /* USBPWR pin inactive */
+ __raw_writel(v, usbother_base + MXC_USBCTRL_OFFSET);
+
+ v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC_OFFSET);
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch
new file mode 100644
index 0000000..704d14d
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch
@@ -0,0 +1,135 @@
+Add USBH2 in the list of MX5 devices.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/mach-mx5/devices.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/devices.c 2010-12-01 15:45:28.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-mx5/devices.c 2010-12-01 15:45:28.000000000 +0100
+@@ -234,6 +234,29 @@
+ },
+ };
+
++static struct resource usbh2_resources[] = {
++ {
++ .start = MX51_OTG_BASE_ADDR + 0x400,
++ .end = MX51_OTG_BASE_ADDR + 0x400 + 0x1ff,
++ .flags = IORESOURCE_MEM,
++ },
++ {
++ .start = MX51_MXC_INT_USB_H2,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++struct platform_device mxc_usbh2_device = {
++ .name = "mxc-ehci",
++ .id = 2,
++ .num_resources = ARRAY_SIZE(usbh2_resources),
++ .resource = usbh2_resources,
++ .dev = {
++ .dma_mask = &usb_dma_mask,
++ .coherent_dma_mask = DMA_BIT_MASK(32),
++ },
++};
++
+ static struct resource mxc_wdt_resources[] = {
+ {
+ .start = MX51_WDOG_BASE_ADDR,
+Index: linux-2.6.36/arch/arm/mach-mx5/devices.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/devices.h 2010-12-01 15:45:28.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-mx5/devices.h 2010-12-01 15:45:28.000000000 +0100
+@@ -5,6 +5,7 @@
+ extern struct platform_device mxc_fec_device;
+ extern struct platform_device mxc_usbdr_host_device;
+ extern struct platform_device mxc_usbh1_device;
++extern struct platform_device mxc_usbh2_device;
+ extern struct platform_device mxc_usbdr_udc_device;
+ extern struct platform_device mxc_wdt;
+ extern struct platform_device mxc_i2c_device0;
+Index: linux-2.6.36/arch/arm/mach-mx5/clock-mx51.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/clock-mx51.c 2010-12-01 15:45:28.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-mx5/clock-mx51.c 2010-12-01 15:45:28.000000000 +0100
+@@ -925,6 +925,8 @@
+ _REGISTER_CLOCK("mxc-ehci.0", "usb_ahb", ahb_clk)
+ _REGISTER_CLOCK("mxc-ehci.1", "usb", usboh3_clk)
+ _REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", ahb_clk)
++ _REGISTER_CLOCK("mxc-ehci.2", "usb", usboh3_clk)
++ _REGISTER_CLOCK("mxc-ehci.2", "usb_ahb", ahb_clk)
+ _REGISTER_CLOCK("fsl-usb2-udc", "usb", usboh3_clk)
+ _REGISTER_CLOCK("fsl-usb2-udc", "usb_ahb", ahb_clk)
+ _REGISTER_CLOCK("imx-keypad.0", NULL, kpp_clk)
+Index: linux-2.6.36/arch/arm/plat-mxc/ehci.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/ehci.c 2010-12-01 15:43:12.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/ehci.c 2010-12-01 16:34:13.000000000 +0100
+@@ -49,6 +49,7 @@
+
+ #define MXC_OTG_OFFSET 0
+ #define MXC_H1_OFFSET 0x200
++#define MXC_H2_OFFSET 0x400
+
+ /* USB_CTRL */
+ #define MXC_OTG_UCTRL_OWIE_BIT (1 << 27) /* OTG wakeup intr enable */
+@@ -57,6 +58,10 @@
+ #define MXC_H1_UCTRL_H1WIE_BIT (1 << 11) /* HOST1 wakeup intr enable */
+ #define MXC_H1_UCTRL_H1PM_BIT (1 << 8) /* HOST1 power mask */
+
++#define MXC_UH2_CTRL_H2UIE_BIT (1 << 8) /* HOST2 ULPI interrupt enable */
++#define MXC_UH2_CTRL_H2WIE_BIT (1 << 7) /* HOST2 wakeup interrupt enable */
++#define MXC_UH2_CTRL_H2PM_BIT (1 << 4) /* HOST2 power mask */
++
+ /* USB_PHY_CTRL_FUNC */
+ #define MXC_OTG_PHYCTRL_OC_DIS_BIT (1 << 8) /* OTG Disable Overcurrent Event */
+ #define MXC_H1_OC_DIS_BIT (1 << 5) /* UH1 Disable Overcurrent Event */
+@@ -262,6 +267,9 @@
+ case 1: /* Host 1 port */
+ usbotg_base = usb_base + MXC_H1_OFFSET;
+ break;
++ case 2: /* Host 2 port */
++ usbotg_base = usb_base + MXC_H2_OFFSET;
++ break;
+ default:
+ printk(KERN_ERR"%s no such port %d\n", __func__, port);
+ ret = -ENOENT;
+@@ -315,6 +323,26 @@
+ v &= MXC_UCMD_ITC_NO_THRESHOLD_MASK;
+ __raw_writel(v, usbotg_base + MXC_USBCMD_OFFSET);
+ break;
++ case 2: /* Host 2 */
++ /*Host ULPI */
++ v = __raw_readl(usbother_base + MXC_USB_UH2_CTRL_OFFSET);
++ if (flags & MXC_EHCI_WAKEUP_ENABLED)
++ v |= (MXC_UH2_CTRL_H2WIE_BIT | MXC_UH2_CTRL_H2UIE_BIT); /* HOST2 wakeup/ULPI intr enabled */
++ else
++ v &= ~(MXC_UH2_CTRL_H2WIE_BIT | MXC_UH2_CTRL_H2UIE_BIT); /* HOST2 wakeup/ULPI intr disabled */
++
++ if (flags & MXC_EHCI_POWER_PINS_ENABLED)
++ v &= ~MXC_UH2_CTRL_H2PM_BIT; /* USBPWR & OC pins used */
++ else
++ v |= MXC_UH2_CTRL_H2PM_BIT; /* USBPWR & OC pins not used */
++ __raw_writel(v, usbother_base + MXC_USB_UH2_CTRL_OFFSET);
++
++ v = __raw_readl(usbotg_base + MXC_USBCMD_OFFSET);
++ if (flags & MXC_EHCI_ITC_NO_THRESHOLD)
++ /* Interrupt Threshold Control:Immediate (no threshold) */
++ v &= MXC_UCMD_ITC_NO_THRESHOLD_MASK;
++ __raw_writel(v, usbotg_base + MXC_USBCMD_OFFSET);
++ break;
+ }
+
+ error:
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/mxc_ehci.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/mxc_ehci.h 2010-12-01 15:43:12.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/mxc_ehci.h 2010-12-01 15:45:28.000000000 +0100
+@@ -31,6 +31,7 @@
+ #define MXC_USBCTRL_OFFSET 0
+ #define MXC_USB_PHY_CTR_FUNC_OFFSET 0x8
+ #define MXC_USB_PHY_CTR_FUNC2_OFFSET 0xc
++#define MXC_USB_UH2_CTRL_OFFSET 0x14
+
+ #define MX5_USBOTHER_REGS_OFFSET 0x800
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/408-armadeus-add_apf51-dev_baseboard.patch
new file mode 100644
index 0000000..859d207
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/408-armadeus-add_apf51-dev_baseboard.patch
@@ -0,0 +1,99 @@
+Add APF51Dev baseboard support.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/mach-mx5/Kconfig
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/Kconfig 2010-12-01 09:33:55.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-mx5/Kconfig 2010-12-01 09:37:01.000000000 +0100
+@@ -49,4 +49,21 @@
+ Include support for Armadeus Systems APF51 System On Module. This
+ includes specific configurations for the board and its peripherals.
+
++config MACH_APF51_HAS_BASEBOARD
++ bool
++
++choice
++ prompt "Baseboard"
++ depends on MACH_APF51
++ default MACH_APF51_DEV
++
++config MACH_APF51_DEV
++ prompt "Armadeus Systems APF51Dev development board"
++ bool
++ select MACH_APF51_HAS_BASEBOARD
++ help
++ This selects the APF51Dev as baseboard and adds board's specific
++ devices.
++endchoice
++
+ endif
+Index: linux-2.6.36/arch/arm/mach-mx5/Makefile
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/Makefile 2010-12-01 09:35:33.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-mx5/Makefile 2010-12-01 09:37:44.000000000 +0100
+@@ -10,3 +10,4 @@
+ obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
+ obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
+ obj-$(CONFIG_MACH_APF51) += board-apf51.o
++obj-$(CONFIG_MACH_APF51_DEV) += apf51-dev-baseboard.o
+Index: linux-2.6.36/arch/arm/mach-mx5/apf51-dev-baseboard.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.36/arch/arm/mach-mx5/apf51-dev-baseboard.c 2010-12-01 14:35:46.000000000 +0100
+@@ -0,0 +1,55 @@
++ /*
++ * apf51-dev-baseboard.c
++ * Support for APF51's development baseboard
++ *
++ * Copyright (C) 2010 Armadeus Systems <su...@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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ */
++
++#include <linux/gpio.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++
++#include <mach/iomux-mx51.h>
++
++#include "devices.h"
++
++static struct pad_desc apf51dev_pads[] = {
++ /* SD1 */
++ MX51_PAD_SD1_CMD__SD1_CMD,
++ MX51_PAD_SD1_CLK__SD1_CLK,
++ MX51_PAD_SD1_DATA0__SD1_DATA0,
++ MX51_PAD_SD1_DATA1__SD1_DATA1,
++ MX51_PAD_SD1_DATA2__SD1_DATA2,
++ MX51_PAD_SD1_DATA3__SD1_DATA3,
++
++ /* SD2 */
++ MX51_PAD_SD2_CMD__SD2_CMD,
++ MX51_PAD_SD2_CLK__SD2_CLK,
++ MX51_PAD_SD2_DATA0__SD2_DATA0,
++ MX51_PAD_SD2_DATA1__SD2_DATA1,
++ MX51_PAD_SD2_DATA2__SD2_DATA2,
++ MX51_PAD_SD2_DATA3__SD2_DATA3,
++};
++
++void __init apf51_baseboard_init(void)
++{
++ printk(" Registering APF51Dev ressources:");
++
++ mxc_iomux_v3_setup_multiple_pads(apf51dev_pads,
++ ARRAY_SIZE(apf51dev_pads));
++
++ printk(" done\n");
++}
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-30 16:53:15
|
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 9b6b500b51a910037532f8f8614b4a80ace307b8 (commit)
via 8d45afd319b2b917c03ef2a26342cdd6a5d56a5f (commit)
from 41dbd71d8fed4412622a9a0f252c1b1d80af9f5e (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 9b6b500b51a910037532f8f8614b4a80ace307b8
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 30 17:52:29 2010 +0100
[LINUX] 2.6.36: Add support for USB Host 1, Ethernet and NAND for APF51
commit 8d45afd319b2b917c03ef2a26342cdd6a5d56a5f
Author: Julien Boibessot <jul...@ar...>
Date: Tue Nov 30 17:49:15 2010 +0100
[BUILD] ARMADEUS_ROOTFS_TAR wasn't correctly set for BR 2010
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 3 +-
.../2.6.36/400-armadeus-add_apf51_module.patch | 225 +++++++++++++++++++-
2 files changed, 216 insertions(+), 12 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index db0d67c..efbd8a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,15 +47,14 @@ BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/toolchain_build_$(ARMADEUS_TARGE
BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/build_$(ARMADEUS_TARGET_ARCH)
ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/binaries/$(ARMADEUS_PROJECT_NAME)
ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/root
-ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
else
BUILDROOT_PROJECT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
BUILDROOT_TOOLCHAIN_BUILD_DIR:=$(BUILDROOT_DIR)/output/toolchain
BUILDROOT_BUILD_DIR:=$(BUILDROOT_DIR)/output/build
ARMADEUS_BINARIES:=$(BUILDROOT_DIR)/output/images
ARMADEUS_ROOTFS_DIR:=$(BUILDROOT_DIR)/output/target
-ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/rootfs.tar
endif
+ARMADEUS_ROOTFS_TAR:=$(ARMADEUS_BINARIES)/$(ARMADEUS_BOARD_NAME)-rootfs.arm.tar
ARMADEUS_LINUX_DIR:=$(BUILDROOT_PROJECT_BUILD_DIR)/linux-$(ARMADEUS_LINUX_VERSION)
ARMADEUS_LINUX_PATCH_DIR:=$(BUILDROOT_DIR)/target/device/armadeus/linux/kernel-patches/$(ARMADEUS_LINUX_VERSION)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
index 34924b2..d18ff91 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
@@ -1,13 +1,14 @@
Index: linux-2.6.36/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.36.orig/arch/arm/mach-mx5/Kconfig 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/arm/mach-mx5/Kconfig 2010-11-11 11:32:41.000000000 +0100
-@@ -42,4 +42,10 @@
+--- linux-2.6.36.orig/arch/arm/mach-mx5/Kconfig 2010-11-30 16:25:47.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-mx5/Kconfig 2010-11-30 16:25:56.000000000 +0100
+@@ -42,4 +42,11 @@
endchoice
+config MACH_ARMADEUS_APF51
+ bool "Support Armadeus APF51"
++ select MXC_ULPI
+ help
+ Include support for Armadeus Systems APF51 System On Module. This
+ includes specific configurations for the board and its peripherals.
@@ -15,8 +16,8 @@ Index: linux-2.6.36/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.36/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.36.orig/arch/arm/mach-mx5/Makefile 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/arch/arm/mach-mx5/Makefile 2010-11-11 11:32:41.000000000 +0100
+--- linux-2.6.36.orig/arch/arm/mach-mx5/Makefile 2010-11-30 16:25:47.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-mx5/Makefile 2010-11-30 16:25:56.000000000 +0100
@@ -9,3 +9,4 @@
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
@@ -25,8 +26,8 @@ Index: linux-2.6.36/arch/arm/mach-mx5/Makefile
Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-mx5/board-apf51.c 2010-11-11 11:32:41.000000000 +0100
-@@ -0,0 +1,97 @@
++++ linux-2.6.36/arch/arm/mach-mx5/board-apf51.c 2010-11-30 16:32:59.000000000 +0100
+@@ -0,0 +1,301 @@
+/*
+ * Copyright 2010 Armadeus Systems
+ *
@@ -42,6 +43,10 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+ */
+
+#include <linux/gpio.h>
++#include <linux/platform_device.h>
++#include <linux/io.h>
++#include <linux/delay.h>
++#include <linux/usb/otg.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
@@ -51,15 +56,38 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+#include <mach/common.h>
+#include <mach/iomux-mx51.h>
+#include <mach/imx-uart.h>
++#include <mach/mxc_nand.h>
++#include <mach/mxc_ehci.h>
++#include <mach/ulpi.h>
+
+#include "devices.h"
+
++/* USB_CTRL_1 */
++#define MX51_USB_CTRL_1_OFFSET 0x10
++#define MX51_USB_CTRL_UH1_EXT_CLK_EN (1 << 25)
++
+
+static struct pad_desc apf51_pads[] = {
+ /* UART2 (Console) */
+ MX51_PAD_UART2_RXD__UART2_RXD,
+ MX51_PAD_UART2_TXD__UART2_TXD,
+
++ /* USB HOST1 */
++ MX51_PAD_USBH1_CLK__USBH1_CLK,
++ MX51_PAD_USBH1_DIR__USBH1_DIR,
++ MX51_PAD_USBH1_NXT__USBH1_NXT,
++ MX51_PAD_USBH1_DATA0__USBH1_DATA0,
++ MX51_PAD_USBH1_DATA1__USBH1_DATA1,
++ MX51_PAD_USBH1_DATA2__USBH1_DATA2,
++ MX51_PAD_USBH1_DATA3__USBH1_DATA3,
++ MX51_PAD_USBH1_DATA4__USBH1_DATA4,
++ MX51_PAD_USBH1_DATA5__USBH1_DATA5,
++ MX51_PAD_USBH1_DATA6__USBH1_DATA6,
++ MX51_PAD_USBH1_DATA7__USBH1_DATA7,
++ MX51_PAD_USBH1_STP__USBH1_STP,
++
++ /* USB HOST2 */
++
+ /* Debug PINS */
+/* MX51_PAD_GPIO_1_2__GPIO_1_2,
+ MX51_PAD_GPIO_1_3__GPIO_1_3,*/
@@ -82,6 +110,176 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+#endif /* SERIAL_IMX */
+
+
++/* APF51 has a 512MB+ 3,3V Micron NAND flash, 8 bits width */
++static struct mxc_nand_platform_data apf51_nand_board_info __initconst = {
++ .width = 1,
++ .hw_ecc = 1,
++ .flash_bbt = 1, /* we handle Bad Block Table */
++};
++
++/* APF51 has an Ethernet PHY connected on internal FEC */
++static struct platform_device *platform_devices[] __initdata = {
++#ifdef CONFIG_FEC
++ &mxc_fec_device,
++#endif
++};
++
++
++/* APF51 has 2 PHYs on USB Host port 1 & 2 */
++
++static int initialize_usbh1_port(struct platform_device *pdev)
++{
++ u32 v;
++ void __iomem *usb_base;
++ u32 usbother_base;
++
++ usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
++ usbother_base = (u32)(usb_base + MX5_USBOTHER_REGS_OFFSET);
++
++ /* The clock for the USBH1 ULPI port will come externally from the PHY. */
++ v = __raw_readl(usbother_base + MX51_USB_CTRL_1_OFFSET);
++ __raw_writel(v | MX51_USB_CTRL_UH1_EXT_CLK_EN, usbother_base + MX51_USB_CTRL_1_OFFSET);
++ iounmap(usb_base);
++
++ return 0;
++}
++
++/* ULPI register addresses */
++#define ULPI_VID_LOW 0x00 /* Vendor ID low */
++#define ULPI_VID_HIGH 0x01 /* Vendor ID high */
++#define ULPI_PID_LOW 0x02 /* Product ID low */
++#define ULPI_PID_HIGH 0x03 /* Product ID high */
++#define ULPI_FCNCTL 0x04 /* Function Control */
++#define ULPI_ITFCTL 0x07 /* Interface Control */
++#define ULPI_OTGCTL 0x0A /* OTG Control */
++
++/* 1504 Function Control Register bits */
++#define RESET (1 << 5) /* Reset */
++
++/* 1504 OTG Control Register bits */
++#define USE_EXT_VBUS_IND (1 << 7) /* Use ext. Vbus indicator */
++#define DRV_VBUS_EXT (1 << 6) /* Drive Vbus external */
++#define DRV_VBUS (1 << 5) /* Drive Vbus */
++#define CHRG_VBUS (1 << 4) /* Charge Vbus */
++#define DISCHRG_VBUS (1 << 3) /* Discharge Vbus */
++#define DM_PULL_DOWN (1 << 2) /* enable DM Pull Down */
++#define DP_PULL_DOWN (1 << 1) /* enable DP Pull Down */
++#define ID_PULL_UP (1 << 0) /* enable ID Pull Up */
++
++
++/* ?? Preferably use stuff from drivers/usb/otg/ulpi.c ?? */
++static int usb3320_init(struct otg_transceiver *otg)
++{
++ int vid, pid;
++
++ printk("*** %s ***\n", __func__);
++
++ vid = otg->io_ops->read(otg, ULPI_VID_HIGH) << 8;
++ vid = vid | otg->io_ops->read(otg, ULPI_VID_LOW);
++
++ pid = otg->io_ops->read(otg, ULPI_PID_HIGH) << 8;
++ pid = pid | otg->io_ops->read(otg, ULPI_PID_LOW);
++
++ pr_info("ULPI OTG Vendor ID 0x%x Product ID 0x%x\n", vid, pid);
++ if (vid != 0x424 || pid != 0x07) {
++ pr_err("No USB3320 found\n");
++ return -1;
++ }
++
++ return 0;
++}
++
++/* ?? Preferably use stuff from drivers/usb/otg/ulpi.c ?? */
++static int usb3320_set_vbus(struct otg_transceiver *otg, bool enabled)
++{
++ int ret = 0;
++ int reg;
++
++ printk("*** %s: %d\n", __func__, enabled);
++
++ if (enabled) {
++ /* force disconnection of the DM/DP signals. This
++ avoid powering the connected device through these lines */
++ reg = otg->io_ops->read(otg, ULPI_FCNCTL);
++ reg |= RESET;
++ otg->io_ops->write(otg, reg, ULPI_FCNCTL);
++ mdelay(10); /* wait until the supply is really down */
++ reg = otg->io_ops->read(otg, ULPI_FCNCTL);
++ reg &= ~RESET;
++ otg->io_ops->write(otg, reg, ULPI_FCNCTL);
++ mdelay(1);
++
++ reg = otg->io_ops->read(otg, ULPI_OTGCTL);
++ reg |= DRV_VBUS_EXT | /* enable external Vbus */
++ DRV_VBUS | /* enable internal Vbus */
++ USE_EXT_VBUS_IND | /* use external indicator */
++ CHRG_VBUS; /* charge Vbus */
++ otg->io_ops->write(otg, reg, ULPI_OTGCTL);
++ } else {
++ reg = otg->io_ops->read(otg, ULPI_OTGCTL);
++ reg &= ~(DRV_VBUS_EXT | /* disable external Vbus */
++ DRV_VBUS); /* disable internal Vbus */
++ reg |= USE_EXT_VBUS_IND | /* use external indicator */
++ DISCHRG_VBUS; /* discharge Vbus */
++ otg->io_ops->write(otg, reg, ULPI_OTGCTL);
++ }
++
++ return ret;
++}
++
++/* ?? Preferably use otg_ulpi_create from drivers/usb/otg/ulpi.c ?? */
++struct otg_transceiver usb3320_1 = {
++ .io_ops = &mxc_ulpi_access_ops,
++ .init = usb3320_init,
++ .set_vbus = usb3320_set_vbus,
++};
++
++static struct mxc_usbh_platform_data usbh1_config = {
++ .init = initialize_usbh1_port,
++ .portsc = MXC_EHCI_MODE_ULPI,
++ .flags = (MXC_EHCI_POWER_PINS_ENABLED | MXC_EHCI_ITC_NO_THRESHOLD),
++ .otg = &usb3320_1,
++};
++
++#define APF51_USBH1_STP (0*32 + 27) /* GPIO_1_27 */
++#define APF51_USB_HOST_PHY_RESET (2*32 +1) /* GPIO_3_1 */
++
++static int apf51_usbh1_active(void)
++{
++ struct pad_desc phyreset_gpio = MX51_PAD_DI1_PIN12__GPIO_3_1;
++ int ret;
++#if 0
++ struct pad_desc usbh1stp_gpio = MX51_PAD_USBH1_STP__GPIO_1_27;
++
++ /* Set USBH1_STP to GPIO and toggle it */
++ mxc_iomux_v3_setup_pad(&usbh1stp_gpio);
++ ret = gpio_request(APF51_USBH1_STP, "usbh1_stp");
++
++ if (ret) {
++ pr_debug("failed to get MX51_PAD_USBH1_STP__GPIO_1_27: %d\n", ret);
++ return ret;
++ }
++ gpio_direction_output(APF51_USBH1_STP, 0);
++ gpio_set_value(APF51_USBH1_STP, 1);
++ msleep(100);
++ gpio_free(APF51_USBH1_STP);
++#endif
++
++ /* De-assert USB PHY RESETB */
++ mxc_iomux_v3_setup_pad(&phyreset_gpio);
++ ret = gpio_request(APF51_USB_HOST_PHY_RESET, "phy_reset");
++
++ if (ret) {
++ pr_debug("failed to get MX51_PAD_DI1_PIN12__GPIO_3_1: %d\n", ret);
++ return ret;
++ }
++ gpio_direction_output(APF51_USB_HOST_PHY_RESET, 1);
++ msleep(50);
++
++ return 0;
++}
++
++
+#define DEBUG1_GPIO (GPIO_PORTA | 2)
+#define DEBUG2_GPIO (GPIO_PORTA | 3)
+/*
@@ -99,6 +297,13 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+ gpio_set_value(DEBUG2_GPIO, 1);
+
+ apf51_init_imx_uart();
++
++ mxc_register_device(&mxc_nand_device, &apf51_nand_board_info);
++ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
++
++ apf51_usbh1_active();
++ mxc_register_device(&mxc_usbh1_device, &usbh1_config);
++
+#ifdef CONFIG_MACH_ARMADEUS_APF51_BASEBOARD
+ apf51_baseboard_init();
+#endif
@@ -126,8 +331,8 @@ Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+
Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-11 12:22:51.000000000 +0100
-+++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-11 12:23:44.000000000 +0100
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-30 16:25:55.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-30 16:25:56.000000000 +0100
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -136,7 +341,7 @@ Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h
static __inline__ void __arch_decomp_setup(unsigned long arch_id)
{
-@@ -101,6 +102,9 @@
+@@ -102,6 +103,9 @@
case MACH_TYPE_MX51_BABBAGE:
uart_base = MX51_UART1_BASE_ADDR;
break;
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2010-11-30 06:11:39
|
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 41dbd71d8fed4412622a9a0f252c1b1d80af9f5e (commit)
from 8f21e4edf1882f7601e5c18203443a2cfeebfdcf (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 41dbd71d8fed4412622a9a0f252c1b1d80af9f5e
Author: Eric Jarrige <eri...@ar...>
Date: Tue Nov 30 07:13:01 2010 +0100
[UBOOT] Remove hardcoded MAC address
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index c176187..a62d1ba 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -227,7 +227,7 @@
#define CONFIG_SHOW_BOOT_PROGRESS
-#define CONFIG_ETHADDR 00:04:F3:02:1C:8F /* to delete asap */
+#define CONFIG_ETHADDR
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_IPADDR 192.168.0.10
#define CONFIG_BOARD_NAME "apf51"
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2010-11-29 22:41: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 8f21e4edf1882f7601e5c18203443a2cfeebfdcf (commit)
from c51bd7325d77d2e6bd29464c323280df2e228d16 (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 8f21e4edf1882f7601e5c18203443a2cfeebfdcf
Author: Eric Jarrige <eri...@ar...>
Date: Mon Nov 29 23:42:13 2010 +0100
Support imx51 IIM fuse
Signed-off-by: Eric Jarrige <eri...@ar...>
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 14 +-
.../target/u-boot/u-boot-2010.03-410-imx-iim.patch | 595 ++++++++++++++++++++
2 files changed, 605 insertions(+), 4 deletions(-)
create mode 100644 buildroot/target/u-boot/u-boot-2010.03-410-imx-iim.patch
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index 014c4c4..c176187 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -84,6 +84,7 @@
#define CONFIG_CMD_EXT2 /* EXT2 Support */
#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
//#define CONFIG_CMD_I2C /* I2C serial bus support */
+#define CONFIG_CMD_IIM /* imx iim fuse */
#undef CONFIG_CMD_IMLS /* List all found images */
#define CONFIG_CMD_IMMAP /* IMMR dump support */
#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
@@ -642,6 +643,15 @@
#define CONFIG_HW_WATCHDOG
+/**
+ * IIM fuse Config
+ */
+
+#define CONFIG_IMX_IIM
+#define IMX_IIM_BASE IIM_BASE_ADDR
+#define CONFIG_IIM_MAC_BANK 1
+#define CONFIG_IIM_MAC_ROW 9
+
/*
* From here, there should not be any user configuration.
* All Equations are automatic
@@ -1012,7 +1022,3 @@
#endif /* __CONFIG_H */
-#ifdef CONFIG_BOARD_NAME
-#undef CONFIG_BOARD_NAME
-#endif
-#define CONFIG_BOARD_NAME apf51
diff --git a/buildroot/target/u-boot/u-boot-2010.03-410-imx-iim.patch b/buildroot/target/u-boot/u-boot-2010.03-410-imx-iim.patch
new file mode 100644
index 0000000..8eb5ff1
--- /dev/null
+++ b/buildroot/target/u-boot/u-boot-2010.03-410-imx-iim.patch
@@ -0,0 +1,595 @@
+--- u-boot-2010.03/common/cmd_iim.c 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2010.03-fec/common/cmd_iim.c 2010-11-25 22:55:47.000000000 +0100
+@@ -0,0 +1,95 @@
++/*
++ * (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
++ *
++ * Copyright 2007, Freescale Semiconductor, Inc
++ * Andy Fleming
++ *
++ * Based vaguely on the pxa mmc code:
++ * (C) Copyright 2003
++ * Kyle Harris, Nexus Technologies, Inc. kh...@ne...
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * 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
++ */
++
++#include <linux/types.h>
++#include <asm/io.h>
++#include <command.h>
++#include <common.h>
++#include <asm/arch/imx_iim.h>
++
++int do_iimops(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
++{
++ int bank = 0,
++ row = 0,
++ val = 0;
++
++ if (argc < 3 || argc > 5)
++ goto err_rtn;
++
++ if (strcmp(argv[1], "read") == 0) {
++ if (strcmp(argv[2], "fecmac") == 0) {
++ if (3 == argc)
++ iim_blow_func(argv[2], NULL);
++ else
++ goto err_rtn;
++ } else {
++ if (4 == argc) {
++ bank = simple_strtoul(argv[2], NULL, 16);
++ row = simple_strtoul(argv[3], NULL, 16);
++
++ iim_read(bank, row);
++ } else
++ goto err_rtn;
++ }
++ } else if (strcmp(argv[1], "blow") == 0) {
++ if (strcmp(argv[2], "fecmac") == 0) {
++ if (4 == argc)
++ iim_blow_func(argv[2], argv[3]);
++ else
++ goto err_rtn;
++ } else {
++ if (5 == argc) {
++ bank = simple_strtoul(argv[2], NULL, 16);
++ row = simple_strtoul(argv[3], NULL, 16);
++ val = simple_strtoul(argv[4], NULL, 16);
++
++ iim_blow(bank, row, val);
++ } else
++ goto err_rtn;
++ }
++ } else
++ goto err_rtn;
++
++ return 0;
++err_rtn:
++ printf("Invalid parameters!\n");
++ printf("It is too dangeous for you to use iim command.\n");
++ return 1;
++}
++
++U_BOOT_CMD(
++ iim, 5, 1, do_iimops,
++ "IIM sub system",
++ "Warning: all numbers in parameter are in hex format!\n"
++ "iim read <bank> <row> - Read some fuses\n"
++ "iim read fecmac - Read FEC Mac address\n"
++ "iim blow <bank> <row> <value> - Blow some fuses\n"
++ "iim blow fecmac <0x##:0x##:0x##:0x##:0x##:0x##>"
++ "- Blow FEC Mac address");
++
+--- u-boot-2010.03/common/Makefile 2010-03-31 23:54:39.000000000 +0200
++++ u-boot-2010.03-fec/common/Makefile 2010-11-25 22:28:22.000000000 +0100
+@@ -99,6 +99,7 @@ COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o
+ ifdef CONFIG_FPGA
+ COBJS-$(CONFIG_CMD_FPGA) += cmd_fpga.o
+ endif
++COBJS-$(CONFIG_CMD_IIM) += cmd_iim.o
+ COBJS-$(CONFIG_CMD_I2C) += cmd_i2c.o
+ COBJS-$(CONFIG_CMD_IDE) += cmd_ide.o
+ COBJS-$(CONFIG_CMD_IMMAP) += cmd_immap.o
+--- u-boot-2010.03/drivers/misc/imx_iim.c 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2010.03-fec/drivers/misc/imx_iim.c 2010-11-25 22:52:55.000000000 +0100
+@@ -0,0 +1,344 @@
++/*
++ * (C) Copyright 2008-2010 Freescale Semiconductor, Inc.
++ * Terry Lv
++ *
++ * Copyright 2007, Freescale Semiconductor, Inc
++ * Andy Fleming
++ *
++ * Based vaguely on the pxa mmc code:
++ * (C) Copyright 2003
++ * Kyle Harris, Nexus Technologies, Inc. kh...@ne...
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * 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
++ */
++
++#include <linux/types.h>
++#include <asm/io.h>
++#include <asm/arch/imx_iim.h>
++#include <asm/arch/imx-regs.h>
++#include <common.h>
++#include <net.h>
++
++static const struct iim_regs *imx_iim =
++ (struct iim_regs *)IMX_IIM_BASE;
++
++static void quick_itoa(u32 num, char *a)
++{
++ int i, j, k;
++ for (i = 0; i <= 7; i++) {
++ j = (num >> (4 * i)) & 0xf;
++ k = (j < 10) ? '0' : ('a' - 0xa);
++ a[i] = j + k;
++ }
++}
++
++/* slen - streng length, e.g.: 23 -> slen=2; abcd -> slen=4 */
++/* only convert hex value as string input. so "12" is 0x12. */
++static u32 quick_atoi(char *a, u32 slen)
++{
++ u32 i, num = 0, digit;
++
++ for (i = 0; i < slen; i++) {
++ if (a[i] >= '0' && a[i] <= '9') {
++ digit = a[i] - '0';
++ } else if (a[i] >= 'a' && a[i] <= 'f') {
++ digit = a[i] - 'a' + 10;
++ } else if (a[i] >= 'A' && a[i] <= 'F') {
++ digit = a[i] - 'A' + 10;
++ } else {
++ printf("ERROR: %c\n", a[i]);
++ return -1;
++ }
++ num = (num * 16) + digit;
++ }
++
++ return num;
++}
++
++static void fuse_op_start(void)
++{
++ /* Do not generate interrupt */
++ writel(0, &(imx_iim->statm));
++ /* clear the status bits and error bits */
++ writel(0x3, &(imx_iim->stat));
++ writel(0xfe, &(imx_iim->err));
++}
++
++/*
++ * The action should be either:
++ * POLL_FUSE_PRGD
++ * or:
++ * POLL_FUSE_SNSD
++ */
++static s32 poll_fuse_op_done(s32 action)
++{
++ u32 status, error;
++
++ if (action != POLL_FUSE_PRGD && action != POLL_FUSE_SNSD) {
++ printf("%s(%d) invalid operation\n", __func__, action);
++ return -1;
++ }
++
++ /* Poll busy bit till it is NOT set */
++ while ((readl(&(imx_iim->stat)) & IIM_STAT_BUSY) != 0)
++ ;
++
++ /* Test for successful write */
++ status = readl(&(imx_iim->stat));
++ error = readl(&(imx_iim->err));
++
++ if ((status & action) != 0 && \
++ (error & (action >> IIM_ERR_SHIFT)) == 0) {
++ if (error) {
++ printf("Even though the operation"
++ "seems successful...\n");
++ printf("There are some error(s) "
++ "at addr=0x%x: 0x%x\n",
++ (u32)&(imx_iim->err), error);
++ }
++ return 0;
++ }
++ printf("%s(%d) failed\n", __func__, action);
++ printf("status address=0x%x, value=0x%x\n",
++ (u32)&(imx_iim->stat), status);
++ printf("There are some error(s) at addr=0x%x: 0x%x\n",
++ (u32)&(imx_iim->err), error);
++ return -1;
++}
++
++static u32 sense_fuse(s32 bank, s32 row, s32 bit)
++{
++ s32 addr, addr_l, addr_h, reg_addr;
++
++ fuse_op_start();
++
++ addr = ((bank << 11) | (row << 3) | (bit & 0x7));
++ /* Set IIM Program Upper Address */
++ addr_h = (addr >> 8) & 0x000000FF;
++ /* Set IIM Program Lower Address */
++ addr_l = (addr & 0x000000FF);
++
++#ifdef IIM_FUSE_DEBUG
++ printf("%s: addr_h=0x%x, addr_l=0x%x\n",
++ __func__, addr_h, addr_l);
++#endif
++ writel(addr_h, &(imx_iim->ua));
++ writel(addr_l, &(imx_iim->la));
++
++ /* Start sensing */
++ writel(0x8, &(imx_iim->fctl));
++ if (poll_fuse_op_done(POLL_FUSE_SNSD) != 0) {
++ printf("%s(bank: %d, row: %d, bit: %d failed\n",
++ __func__, bank, row, bit);
++ }
++ reg_addr = (s32*)&(imx_iim->sdat);
++
++ return readl(reg_addr);
++}
++
++int iim_read(int bank, char row)
++{
++ u32 fuse_val;
++ s32 err = 0;
++
++ printf("Read fuse at bank:%d row:%d\n", bank, row);
++ fuse_val = sense_fuse(bank, row, 0);
++ printf("fuses at (bank:%d, row:%d) = 0x%x\n", bank, row, fuse_val);
++
++ return err;
++}
++
++/* Blow fuses based on the bank, row and bit positions (all 0-based)
++*/
++static s32 fuse_blow_bit(s32 bank, s32 row, s32 bit)
++{
++ int addr, addr_l, addr_h, ret = -1;
++
++ fuse_op_start();
++
++ /* Disable IIM Program Protect */
++ writel(0xaa, &(imx_iim->preg_p));
++
++ addr = ((bank << 11) | (row << 3) | (bit & 0x7));
++ /* Set IIM Program Upper Address */
++ addr_h = (addr >> 8) & 0x000000FF;
++ /* Set IIM Program Lower Address */
++ addr_l = (addr & 0x000000FF);
++
++#ifdef IIM_FUSE_DEBUG
++ printf("blowing addr_h=0x%x, addr_l=0x%x\n", addr_h, addr_l);
++#endif
++
++ writel(addr_h, &(imx_iim->ua));
++ writel(addr_l, &(imx_iim->la));
++
++ /* Start Programming */
++ writel(0x31, &(imx_iim->fctl));
++ if (poll_fuse_op_done(POLL_FUSE_PRGD) == 0)
++ ret = 0;
++
++ /* Enable IIM Program Protect */
++ writel(0x0, &(imx_iim->preg_p));
++
++ return ret;
++}
++
++static void fuse_blow_row(s32 bank, s32 row, s32 value)
++{
++ u32 reg, i;
++
++ /* enable fuse blown */
++ reg = readl(CCM_BASE_ADDR + 0x64);
++ reg |= 0x10;
++ writel(reg, CCM_BASE_ADDR + 0x64);
++
++ for (i = 0; i < 8; i++) {
++ if (((value >> i) & 0x1) == 0)
++ continue;
++ if (fuse_blow_bit(bank, row, i) != 0) {
++ printf("fuse_blow_bit(bank: %d, row: %d, "
++ "bit: %d failed\n",
++ bank, row, i);
++ }
++ }
++ reg &= ~0x10;
++ writel(reg, CCM_BASE_ADDR + 0x64);
++}
++
++int iim_blow(int bank, int row, int val)
++{
++ u32 fuse_val, err = 0;
++
++ printf("Blowing fuse at bank:%d row:%d value:%d\n",
++ bank, row, val);
++ fuse_blow_row(bank, row, val);
++ fuse_val = sense_fuse(bank, row, 0);
++ printf("fuses at (bank:%d, row:%d) = 0x%x\n", bank, row, fuse_val);
++
++ return err;
++}
++
++static int iim_read_mac_addr(u8 *data)
++{
++ s32 bank = CONFIG_IIM_MAC_BANK;
++ s32 row = CONFIG_IIM_MAC_ROW;
++
++ data[0] = sense_fuse(bank, row, 0) ;
++ data[1] = sense_fuse(bank, row + 1, 0) ;
++ data[2] = sense_fuse(bank, row + 2, 0) ;
++ data[3] = sense_fuse(bank, row + 3, 0) ;
++ data[4] = sense_fuse(bank, row + 4, 0) ;
++ data[5] = sense_fuse(bank, row + 5, 0) ;
++
++ if (!memcmp(data, "\0\0\0\0\0\0", 6))
++ return 0;
++ else
++ return 1;
++}
++
++int iim_blow_func(char *func_name, char *func_val)
++{
++ u32 value, i;
++ char *s;
++ char val[3];
++ s32 err = 0;
++
++ if (0 == strcmp(func_name, "scc")) {
++ /* fuse_blow scc
++ C3D153EDFD2EA9982226EF5047D3B9A0B9C7138EA87C028401D28C2C2C0B9AA2 */
++ printf("Ready to burn SCC fuses\n");
++ s = func_val;
++ for (i = 0; ; ++i) {
++ memcpy(val, s, 2);
++ val[2] = '\0';
++ value = quick_atoi(val, 2);
++ /* printf("fuse_blow_row(2, %d, value=0x%x)\n",
++ i, value); */
++ fuse_blow_row(2, i, value);
++
++ if ((++s)[0] == '\0') {
++ printf("ERROR: Odd string input\n");
++ err = -1;
++ break;
++ }
++ if ((++s)[0] == '\0') {
++ printf("Successful\n");
++ break;
++ }
++ }
++ } else if (0 == strcmp(func_name, "srk")) {
++ /* fuse_blow srk
++ 418bccd09b53bee1ab59e2662b3c7877bc0094caee201052add49be8780dff95 */
++ printf("Ready to burn SRK key fuses\n");
++ s = func_val;
++ for (i = 0; ; ++i) {
++ memcpy(val, s, 2);
++ val[2] = '\0';
++ value = quick_atoi(val, 2);
++ if (i == 0) {
++ /* 0x41 goes to SRK_HASH[255:248],
++ * bank 1, row 1 */
++ fuse_blow_row(1, 1, value);
++ } else {
++ /* 0x8b in SRK_HASH[247:240] bank 3, row 1 */
++ /* 0xcc in SRK_HASH[239:232] bank 3, row 2 */
++ /* ... */
++ fuse_blow_row(3, i, value);
++
++ if ((++s)[0] == '\0') {
++ printf("ERROR: Odd string input\n");
++ err = -1;
++ break;
++ }
++ if ((++s)[0] == '\0') {
++ printf("Successful\n");
++ break;
++ }
++ }
++ }
++ } else if (0 == strcmp(func_name, "fecmac")) {
++ u8 ea[6] = { 0 };
++
++ if (NULL == func_val) {
++ /* Read the Mac address and print it */
++ iim_read_mac_addr(ea);
++
++ printf("FEC MAC address: ");
++ printf("0x%02x:0x%02x:0x%02x:0x%02x:0x%02x:0x%02x\n\n",
++ ea[0], ea[1], ea[2], ea[3], ea[4], ea[5]);
++
++ return 0;
++ }
++
++ eth_parse_enetaddr(func_val, ea);
++ if (!is_valid_ether_addr(ea)) {
++ printf("Error: invalid mac address parameter!\n");
++ err = -1;
++ } else {
++ for (i = 0; i < 6; ++i)
++ fuse_blow_row(1, i + 9, ea[i]);
++ }
++ } else {
++ printf("This command is not supported\n");
++ }
++
++ return err;
++}
++
++
+--- u-boot-2010.03/drivers/misc/Makefile 2010-03-31 23:54:39.000000000 +0200
++++ u-boot-2010.03-fec/drivers/misc/Makefile 2010-11-25 22:26:33.000000000 +0100
+@@ -28,6 +28,7 @@ LIB := $(obj)libmisc.a
+ COBJS-$(CONFIG_ALI152X) += ali512x.o
+ COBJS-$(CONFIG_DS4510) += ds4510.o
+ COBJS-$(CONFIG_FSL_LAW) += fsl_law.o
++COBJS-$(CONFIG_IMX_IIM) += imx_iim.o
+ COBJS-$(CONFIG_NS87308) += ns87308.o
+ COBJS-$(CONFIG_STATUS_LED) += status_led.o
+ COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o
+--- u-boot-2010.03/drivers/net/fec_mxc.c 2010-11-29 23:16:52.000000000 +0100
++++ u-boot-2010.03-fec/drivers/net/fec_mxc.c 2010-11-29 00:24:23.000000000 +0100
+@@ -333,12 +333,14 @@ static void fec_rbd_clean(int last, stru
+
+ static int fec_get_hwaddr(struct eth_device *dev, unsigned char *mac)
+ {
+-/*
+- * The MX27 can store the mac address in internal eeprom
+- * This mechanism is not supported now by MX51
+- */
+ #ifdef CONFIG_MX51
+- return -1;
++ struct iim_regs *iim = (struct iim_regs *)IIM_BASE_ADDR;
++ int i;
++
++ for (i = 0; i < 6; i++)
++ mac[i] = readl(&iim->iim_bank_area1[IIM0_MAC + i]);
++
++ return !is_valid_ether_addr(mac);
+ #else
+ struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;
+ int i;
+--- u-boot-2010.03/include/asm-arm/arch-mx51/imx_iim.h 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2010.03-fec/include/asm-arm/arch-mx51/imx_iim.h 2010-11-28 23:21:41.000000000 +0100
+@@ -0,0 +1,43 @@
++/*
++ * (C) Copyright 2009-2010 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 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
++ */
++
++#ifndef __IMX_IIM_H__
++#define __IMX_IIM_H__
++
++
++#define IIM_PROD_REV_SH 3
++#define IIM_PROD_REV_LEN 5
++#define IIM_SREV_REV_SH 4
++#define IIM_SREV_REV_LEN 4
++#define PROD_SIGNATURE_MX51 0x1
++
++#define IIM_ERR_SHIFT 8
++#define POLL_FUSE_PRGD (IIM_STAT_PRGD | (IIM_ERR_PRGE << IIM_ERR_SHIFT))
++#define POLL_FUSE_SNSD (IIM_STAT_SNSD | (IIM_ERR_SNSE << IIM_ERR_SHIFT))
++
++#define IIM_BANK_AREA_0_OFFSET 0x800
++#define IIM_BANK_AREA_1_OFFSET 0xc00
++#define IIM_BANK_AREA_2_OFFSET 0x1000
++#define IIM_BANK_AREA_3_OFFSET 0x1400
++
++int iim_read(int bank, char row);
++int iim_blow(int bank, int row, int val);
++int iim_blow_func(char *func_name, char *func_val);
++
++#endif
+--- u-boot-2010.03/include/asm-arm/arch-mx51/imx-regs.h 2010-11-29 23:16:52.000000000 +0100
++++ u-boot-2010.03-fec/include/asm-arm/arch-mx51/imx-regs.h 2010-11-29 00:21:06.000000000 +0100
+@@ -204,6 +204,8 @@
+ #define BOARD_REV_1_0 0x0
+ #define BOARD_REV_2_0 0x1
+
++/* FUSE bank offsets */
++#define IIM0_MAC 0x9
+
+ /* DDR commands */
+ /* cs ChipSelect in range of 0..1 */
+@@ -254,6 +256,49 @@ struct clkctl {
+ u32 cmeor;
+ };
+
++/* IIM Control Registers */
++struct iim_regs {
++#define IIM_STAT_BUSY (1 << 7)
++#define IIM_STAT_PRGD (1 << 1)
++#define IIM_STAT_SNSD (1 << 0)
++ u32 stat;
++ u32 statm;
++#define IIM_ERR_PRGE (1 << 7)
++#define IIM_ERR_WPE (1 << 6)
++#define IIM_ERR_OPE (1 << 5)
++#define IIM_ERR_RPE (1 << 4)
++#define IIM_ERR_WLRE (1 << 3)
++#define IIM_ERR_SNSE (1 << 2)
++#define IIM_ERR_PARITYE (1 << 1)
++ u32 err;
++ u32 emask;
++ u32 fctl;
++ u32 ua;
++ u32 la;
++ u32 sdat;
++ u32 prev;
++ u32 srev;
++ u32 preg_p;
++ u32 scs0;
++ u32 scs1;
++ u32 scs2;
++ u32 scs3;
++ u32 sahara_en0;
++ u32 sahara_en1;
++ u32 sahara_en2;
++ u32 sahara_en3;
++ u32 sahara_en4;
++ u32 sahara_en5;
++ u32 res1[0x1EB];
++ u32 iim_bank_area0[0x20];
++ u32 res2[0xE0];
++ u32 iim_bank_area1[0x20];
++ u32 res3[0xE0];
++ u32 iim_bank_area2[0x20];
++ u32 res4[0xE0];
++ u32 iim_bank_area3[0x20];
++};
++
+ /* WEIM registers */
+ struct weim {
+ u32 csgcr1;
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-26 11:01: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 c51bd7325d77d2e6bd29464c323280df2e228d16 (commit)
via 203bb24a699662bd2bd2fd64068aa6c223f03b0e (commit)
from 3438a26981680f297da668258c5072441cb2c6b6 (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 c51bd7325d77d2e6bd29464c323280df2e228d16
Merge: 203bb24a699662bd2bd2fd64068aa6c223f03b0e 3438a26981680f297da668258c5072441cb2c6b6
Author: Julien Boibessot <jul...@ar...>
Date: Fri Nov 26 12:01:06 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 203bb24a699662bd2bd2fd64068aa6c223f03b0e
Author: Julien Boibessot <jul...@ar...>
Date: Fri Nov 26 12:00:40 2010 +0100
[LINUX] 2.6.36: Import patches 341, 342, 345, 347c & 348 from 2.6.29
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.36.config | 6 ++++
...ial-add_uart_modules_selection_in_kconfig.patch | 22 +++++++-------
..._are_not_available_on_apf27_based_designs.patch | 12 ++++----
...isplay_gpio_number_when_reservation_fails.patch | 30 ++++++++++++++++++++
...c-armadeus-lan95xx-activate_blinking_leds.patch | 20 ++++++------
...at-mxc-gpio-mxc_gpio_set_behaviour_change.patch | 21 ++++++++++++++
6 files changed, 84 insertions(+), 27 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch (82%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch (80%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/347c-armadeus-lan95xx-activate_blinking_leds.patch (63%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/348-armadeus-plat-mxc-gpio-mxc_gpio_set_behaviour_change.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
index 83916f6..9c928d0 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
@@ -981,6 +981,12 @@ CONFIG_DEVKMEM=y
# CONFIG_SERIAL_MAX3107 is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_IMX_UART1=y
+# CONFIG_SERIAL_IMX_UART2 is not set
+CONFIG_SERIAL_IMX_UART3=y
+# CONFIG_SERIAL_IMX_UART3_USE_RTSCTS is not set
+# CONFIG_SERIAL_IMX_UART5 is not set
+# CONFIG_SERIAL_IMX_UART6 is not set
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_TIMBERDALE is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
similarity index 82%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
index 5b38d71..3a250f0 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch
@@ -3,11 +3,11 @@ functionnalities, so it can be interesting to individually select them or not.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29.6/drivers/serial/Kconfig
+Index: linux-2.6.36/drivers/serial/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-14 20:38:17.000000000 +0100
-+++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-15 07:51:45.000000000 +0100
-@@ -831,6 +831,67 @@
+--- linux-2.6.36.orig/drivers/serial/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/serial/Kconfig 2010-11-26 10:16:02.000000000 +0100
+@@ -906,6 +906,67 @@
your boot loader (lilo or loadlin) about how to pass options to the
kernel at boot time.)
@@ -16,7 +16,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ depends on SERIAL_IMX && (ARCH_MX1 || ARCH_MX2 || ARCH_MX3)
+ default y
+ help
-+ /dev/ttySMX0
++ /dev/ttymxc0
+
+config SERIAL_IMX_UART1_USE_RTSCTS
+ bool "Uses UART1 RTS/CTS lines"
@@ -26,7 +26,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ bool "UART2"
+ depends on SERIAL_IMX && (ARCH_MX1 || ARCH_MX2 || ARCH_MX3)
+ help
-+ /dev/ttySMX1
++ /dev/ttymxc1
+
+config SERIAL_IMX_UART2_USE_RTSCTS
+ bool "Uses UART2 RTS/CTS lines"
@@ -36,7 +36,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ bool "UART3"
+ depends on SERIAL_IMX && (ARCH_MX2 || ARCH_MX3)
+ help
-+ /dev/ttySMX2
++ /dev/ttymxc2
+
+config SERIAL_IMX_UART3_USE_RTSCTS
+ bool "Uses UART3 RTS/CTS lines"
@@ -46,7 +46,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ bool "UART4"
+ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
+ help
-+ /dev/ttySMX3
++ /dev/ttymxc3
+
+config SERIAL_IMX_UART4_USE_RTSCTS
+ bool "Uses UART4 RTS/CTS lines"
@@ -56,7 +56,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ bool "UART5"
+ depends on SERIAL_IMX && (MACH_MX25 || MACH_MX27 || MACH_MX31)
+ help
-+ /dev/ttySMX4
++ /dev/ttymxc4
+
+config SERIAL_IMX_UART5_USE_RTSCTS
+ bool "Uses UART5 RTS/CTS lines"
@@ -66,7 +66,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+ bool "UART6"
+ depends on SERIAL_IMX && (MACH_MX27)
+ help
-+ /dev/ttySMX5
++ /dev/ttymxc5
+
+config SERIAL_IMX_UART6_USE_RTSCTS
+ bool "Uses UART6 RTS/CTS lines"
@@ -74,4 +74,4 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
+
config SERIAL_UARTLITE
tristate "Xilinx uartlite serial port support"
- depends on PPC32
+ depends on PPC32 || MICROBLAZE || MFD_TIMBERDALE
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
similarity index 80%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
index 291c7cd..40490b0 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch
@@ -6,11 +6,11 @@ On APF27 based designs some UART pins are missing:
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29.6/drivers/serial/Kconfig
+Index: linux-2.6.36/drivers/serial/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/serial/Kconfig 2009-12-16 12:08:10.000000000 +0100
-+++ linux-2.6.29.6/drivers/serial/Kconfig 2009-12-16 12:08:10.000000000 +0100
-@@ -840,7 +840,7 @@
+--- linux-2.6.36.orig/drivers/serial/Kconfig 2010-11-26 10:16:02.000000000 +0100
++++ linux-2.6.36/drivers/serial/Kconfig 2010-11-26 10:31:53.000000000 +0100
+@@ -915,7 +915,7 @@
config SERIAL_IMX_UART1_USE_RTSCTS
bool "Uses UART1 RTS/CTS lines"
@@ -19,7 +19,7 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
config SERIAL_IMX_UART2
bool "UART2"
-@@ -860,11 +860,11 @@
+@@ -935,11 +935,11 @@
config SERIAL_IMX_UART3_USE_RTSCTS
bool "Uses UART3 RTS/CTS lines"
@@ -31,5 +31,5 @@ Index: linux-2.6.29.6/drivers/serial/Kconfig
- depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31)
+ depends on SERIAL_IMX && (MACH_MX21 || MACH_MX25 || MACH_MX27 || MACH_MX31) && (!MACH_APF27_DEV)
help
- /dev/ttySMX3
+ /dev/ttymxc3
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
new file mode 100644
index 0000000..31136dc
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch
@@ -0,0 +1,30 @@
+Ease debugging when GPIO allocation fails.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/iomux-v1.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/iomux-v1.c 2010-11-26 10:38:39.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/iomux-v1.c 2010-11-26 10:42:18.000000000 +0100
+@@ -174,9 +174,10 @@
+ {
+ size_t i;
+ int ret;
++ unsigned gpio;
+
+ for (i = 0; i < count; ++i) {
+- unsigned gpio = pin_list[i] & (GPIO_PIN_MASK | GPIO_PORT_MASK);
++ gpio = pin_list[i] & (GPIO_PIN_MASK | GPIO_PORT_MASK);
+
+ ret = gpio_request(gpio, label);
+ if (ret)
+@@ -193,6 +194,9 @@
+ BUG_ON(i != count);
+
+ err_gpio_request:
++ printk("*** Failed to reserve GPIO %d (port %c pin %d)\n", gpio,
++ 0x41 + ((gpio & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT),
++ gpio & GPIO_PIN_MASK);
+ mxc_gpio_release_multiple_pins(pin_list, i);
+
+ return ret;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/347c-armadeus-lan95xx-activate_blinking_leds.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/347c-armadeus-lan95xx-activate_blinking_leds.patch
similarity index 63%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/347c-armadeus-lan95xx-activate_blinking_leds.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/347c-armadeus-lan95xx-activate_blinking_leds.patch
index 598896a..9c1afa6 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/347c-armadeus-lan95xx-activate_blinking_leds.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/347c-armadeus-lan95xx-activate_blinking_leds.patch
@@ -1,15 +1,15 @@
-smsc95xx: Separe link led and activity led
+smsc95xx: Separe link and activity LEDs.
Signed-off-by: Fabien Marteau <fab...@ar...>
----
-Index: linux-2.6.29.6/drivers/net/usb/smsc95xx.c
+Index: linux-2.6.36/drivers/net/usb/smsc95xx.c
===================================================================
---- linux-2.6.29.6.orig/drivers/net/usb/smsc95xx.c 2010-04-13 16:27:42.000000000 +0200
-+++ linux-2.6.29.6/drivers/net/usb/smsc95xx.c 2010-04-13 16:33:39.000000000 +0200
-@@ -941,8 +941,11 @@
- devdbg(dev, "ID_REV = 0x%08x", read_buf);
+--- linux-2.6.36.orig/drivers/net/usb/smsc95xx.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/net/usb/smsc95xx.c 2010-11-26 10:55:57.000000000 +0100
+@@ -933,8 +933,11 @@
+ netif_dbg(dev, ifup, dev->net, "ID_REV = 0x%08x\n", read_buf);
/* Configure GPIO pins as LED outputs */
- write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_LNK_LED |
@@ -21,11 +21,11 @@ Index: linux-2.6.29.6/drivers/net/usb/smsc95xx.c
+
ret = smsc95xx_write_reg(dev, LED_GPIO_CFG, write_buf);
if (ret < 0) {
- devwarn(dev, "Failed to write LED_GPIO_CFG register, ret=%d",
-Index: linux-2.6.29.6/drivers/net/usb/smsc95xx.h
+ netdev_warn(dev->net, "Failed to write LED_GPIO_CFG register, ret=%d\n",
+Index: linux-2.6.36/drivers/net/usb/smsc95xx.h
===================================================================
---- linux-2.6.29.6.orig/drivers/net/usb/smsc95xx.h 2010-04-13 16:27:40.000000000 +0200
-+++ linux-2.6.29.6/drivers/net/usb/smsc95xx.h 2010-04-13 16:36:41.000000000 +0200
+--- linux-2.6.36.orig/drivers/net/usb/smsc95xx.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/net/usb/smsc95xx.h 2010-11-26 10:55:57.000000000 +0100
@@ -99,10 +99,15 @@
#define PM_CTL_WUPS_MULTI_ (0x00000003)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/348-armadeus-plat-mxc-gpio-mxc_gpio_set_behaviour_change.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/348-armadeus-plat-mxc-gpio-mxc_gpio_set_behaviour_change.patch
new file mode 100644
index 0000000..28753b9
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/348-armadeus-plat-mxc-gpio-mxc_gpio_set_behaviour_change.patch
@@ -0,0 +1,21 @@
+Fix mxc_gpio_set() behaviour bug.
+
+This patch modify mxc_gpio_set() function to have the same behaviour as others
+platform *_gpio_set() function.
+When value=0 set pin to 0 in all other cases set pin to 1.
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/gpio.c
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/gpio.c 2010-11-26 11:15:25.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/gpio.c 2010-11-26 11:15:52.000000000 +0100
+@@ -235,7 +235,7 @@
+ unsigned long flags;
+
+ spin_lock_irqsave(&port->lock, flags);
+- l = (__raw_readl(reg) & (~(1 << offset))) | (value << offset);
++ l = (__raw_readl(reg) & (~(1 << offset))) | ((value ? 1:0) << offset);
+ __raw_writel(l, reg);
+ spin_unlock_irqrestore(&port->lock, flags);
+ }
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-11-26 10:29: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 3438a26981680f297da668258c5072441cb2c6b6 (commit)
from a9b0e585dcbf3dc6811b43352d13de9377f7b5d3 (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 3438a26981680f297da668258c5072441cb2c6b6
Author: nicolas colombain <nic...@ar...>
Date: Fri Nov 26 11:28:12 2010 +0100
[U-BOOT] add fpga support
-----------------------------------------------------------------------
Summary of changes:
.../target/u-boot/u-boot-2010.03-401-apf51.patch | 539 +++++++++++++++++---
1 files changed, 465 insertions(+), 74 deletions(-)
diff --git a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
index 376a5b6..623ca70 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
@@ -1,7 +1,7 @@
diff -purN u-boot-2010.03-ref/board/armadeus/apf51/apf51.c u-boot-2010.03/board/armadeus/apf51/apf51.c
--- u-boot-2010.03-ref/board/armadeus/apf51/apf51.c 1970-01-01 01:00:00.000000000 +0100
+++ u-boot-2010.03/board/armadeus/apf51/apf51.c 2010-11-10 00:45:59.000000000 +0100
-@@ -0,0 +1,988 @@
+@@ -0,0 +1,1071 @@
+/*
+ * (C) Copyright 2010 Eric Jarrige, Armadeus Project
+ *
@@ -31,18 +31,45 @@ diff -purN u-boot-2010.03-ref/board/armadeus/apf51/apf51.c u-boot-2010.03/board/
+#include <asm/arch/asm-offsets.h>
+#include <asm/arch/mx51_pins.h>
+#include <asm/arch/iomux.h>
-+#include <asm/arch/sys_proto.h>
+#include <asm/errno.h>
+#include <i2c.h>
+//#include <asm/arch/imx_spi.h>
+//#include <asm/arch/gpio.h>
+#include <asm/arch/mxc_nand.h>
++#include "fpga.h"
++
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static u32 system_rev;
+unsigned long boot_verb = 0;
+
++/*
++static int read_firmware (size_t offset, size_t end, u_char * buf)
++{
++ size_t amount_loaded = 0;
++ size_t blocksize;
++
++ u_char *char_ptr;
++
++ blocksize = nand_info[0].erasesize;
++
++ while (offset < end) {
++ if (nand_block_isbad(&nand_info[0], offset)) {
++ offset += blocksize;
++ } else {
++ char_ptr = &buf[amount_loaded];
++ if (nand_read(&nand_info[0], offset, &blocksize, char_ptr))
++ return 1;
++ offset += blocksize;
++ amount_loaded += blocksize;
++ }
++ }
++
++ return amount_loaded;
++}
++*/
++
+u32 get_board_rev(void)
+{
+ return system_rev;
@@ -334,6 +361,89 @@ diff -purN u-boot-2010.03-ref/board/armadeus/apf51/apf51.c u-boot-2010.03/board/
+ mxc_request_iomux(MX51_PIN_KEY_COL5, IOMUX_CONFIG_ALT0);
+}
+
++void setup_misc(void)
++{
++ /*
++ * Configure iomux for misc interfaces
++ */
++#define GPIO_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | \
++ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
++ PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
++
++ /* pwm 1 & 2 */
++ mxc_request_iomux(MX51_PIN_GPIO1_2, IOMUX_CONFIG_ALT1);
++ mxc_iomux_set_pad(MX51_PIN_GPIO1_2, GPIO_PAD_CFG);
++
++ mxc_request_iomux(MX51_PIN_GPIO1_3, IOMUX_CONFIG_ALT1);
++ mxc_iomux_set_pad(MX51_PIN_GPIO1_3, GPIO_PAD_CFG);
++
++ /* touch detect# */
++ mxc_request_iomux(MX51_PIN_GPIO1_4, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_GPIO1_4, GPIO_PAD_CFG);
++
++ /* clko */
++ mxc_request_iomux(MX51_PIN_GPIO1_5, IOMUX_CONFIG_ALT5);
++ mxc_iomux_set_pad(MX51_PIN_GPIO1_5, GPIO_PAD_CFG);
++
++ /* touch eoc# */
++ mxc_request_iomux(MX51_PIN_GPIO1_6, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_GPIO1_6, GPIO_PAD_CFG);
++
++ /* PMIC IRQ */
++ mxc_request_iomux(MX51_PIN_GPIO1_7, IOMUX_CONFIG_ALT0);
++
++ /* FEC PHY RST# */
++ mxc_request_iomux(MX51_PIN_DI1_PIN11, IOMUX_CONFIG_ALT4);
++ mxc_iomux_set_pad(MX51_PIN_DI1_PIN11, GPIO_PAD_CFG);
++
++ /* USBHOST RST# */
++ mxc_request_iomux(MX51_PIN_DI1_PIN12, IOMUX_CONFIG_ALT4);
++ mxc_iomux_set_pad(MX51_PIN_DI1_PIN12, GPIO_PAD_CFG);
++
++ /* PMIC SLEEP# */
++ mxc_request_iomux(MX51_PIN_DISPB2_SER_CLK, IOMUX_CONFIG_ALT4);
++ mxc_iomux_set_pad(MX51_PIN_DISPB2_SER_CLK, GPIO_PAD_CFG);
++
++ /* PMIC OFF# */
++ mxc_request_iomux(MX51_PIN_DISPB2_SER_RS, IOMUX_CONFIG_ALT4);
++ mxc_iomux_set_pad(MX51_PIN_DISPB2_SER_RS, GPIO_PAD_CFG);
++}
++
++void setup_fpga(void)
++{
++ /* FPGA PWR */
++ mxc_request_iomux(CONFIG_SYS_FPGA_PWR, IOMUX_CONFIG_ALT4);
++ mxc_iomux_set_pad(CONFIG_SYS_FPGA_PWR, GPIO_PAD_CFG);
++
++ /* FPGA SUSPEND */
++ mxc_request_iomux(CONFIG_SYS_FPGA_SUSPEND, IOMUX_CONFIG_ALT4);
++ mxc_iomux_set_pad(CONFIG_SYS_FPGA_SUSPEND, GPIO_PAD_CFG);
++
++ /* FPGA PROG */
++ mxc_request_iomux(CONFIG_SYS_FPGA_PRG, IOMUX_CONFIG_ALT3);
++ mxc_iomux_set_pad(CONFIG_SYS_FPGA_PRG, GPIO_PAD_CFG);
++
++ /* FPGA DONE */
++ mxc_request_iomux(CONFIG_SYS_FPGA_DONE, IOMUX_CONFIG_ALT3);
++ mxc_iomux_set_pad(CONFIG_SYS_FPGA_DONE, GPIO_PAD_CFG);
++
++ /* FPGA INIT# */
++ mxc_request_iomux(CONFIG_SYS_FPGA_INIT, IOMUX_CONFIG_ALT3);
++ mxc_iomux_set_pad(CONFIG_SYS_FPGA_INIT, GPIO_PAD_CFG);
++
++ #define CS1GCR1 0x18
++ #define CS1WCR1 0x28
++ #define WCR 0x90
++
++ /* set 16bits bus size, muxed synchronous mode */
++ __REG(WEIM_BASE_ADDR + CS1GCR1) = 0x019100bf;
++ /* adjust CS1 timings */
++ __REG(WEIM_BASE_ADDR + CS1WCR1) = 0x01000008; /* full speed write */
++
++ /* force BCLK free run */
++ __REG(WEIM_BASE_ADDR + WCR) = 0x00000021;
++}
++
+void setup_display(void)
+{
+ /*
@@ -472,79 +582,13 @@ diff -purN u-boot-2010.03-ref/board/armadeus/apf51/apf51.c u-boot-2010.03/board/
+ __REG(baddr + GPIO_DR) &= ~(1 << gpio_off);
+}
+
-+void setup_misc(void)
++int imx_gpio_pin_get(unsigned int pin)
+{
-+ /*
-+ * Configure iomux for misc interfaces
-+ */
-+#define GPIO_PAD_CFG (PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE | \
-+ PAD_CTL_PUE_KEEPER | PAD_CTL_100K_PU | \
-+ PAD_CTL_DRV_HIGH | PAD_CTL_SRE_FAST)
-+
-+ /* pwm 1 & 2 */
-+ mxc_request_iomux(MX51_PIN_GPIO1_2, IOMUX_CONFIG_ALT1);
-+ mxc_iomux_set_pad(MX51_PIN_GPIO1_2, GPIO_PAD_CFG);
-+
-+ mxc_request_iomux(MX51_PIN_GPIO1_3, IOMUX_CONFIG_ALT1);
-+ mxc_iomux_set_pad(MX51_PIN_GPIO1_3, GPIO_PAD_CFG);
-+
-+ /* touch detect# */
-+ mxc_request_iomux(MX51_PIN_GPIO1_4, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_GPIO1_4, GPIO_PAD_CFG);
-+
-+ /* clko */
-+ mxc_request_iomux(MX51_PIN_GPIO1_5, IOMUX_CONFIG_ALT5);
-+ mxc_iomux_set_pad(MX51_PIN_GPIO1_5, GPIO_PAD_CFG);
-+
-+ /* touch eoc# */
-+ mxc_request_iomux(MX51_PIN_GPIO1_6, IOMUX_CONFIG_ALT0);
-+ mxc_iomux_set_pad(MX51_PIN_GPIO1_6, GPIO_PAD_CFG);
-+
-+ /* PMIC IRQ */
-+ mxc_request_iomux(MX51_PIN_GPIO1_7, IOMUX_CONFIG_ALT0);
-+
-+ /* FPGA PWR */
-+ mxc_request_iomux(MX51_PIN_DI1_D0_CS, IOMUX_CONFIG_ALT4);
-+ mxc_iomux_set_pad(MX51_PIN_DI1_D0_CS, GPIO_PAD_CFG);
-+
-+ /* FEC PHY RST# */
-+ mxc_request_iomux(MX51_PIN_DI1_PIN11, IOMUX_CONFIG_ALT4);
-+ mxc_iomux_set_pad(MX51_PIN_DI1_PIN11, GPIO_PAD_CFG);
-+ /* Ethernet PHY Reset in */
-+ imx_gpio_pin_set(CONFIG_SYS_PHY_RESET_GPIO,0); /* MX51_PIN_DI1_PIN11 */
-+ imx_gpio_pin_cfg_dir(CONFIG_SYS_PHY_RESET_GPIO, 1);
-+
-+ /* USBHOST RST# */
-+ mxc_request_iomux(MX51_PIN_DI1_PIN12, IOMUX_CONFIG_ALT4);
-+ mxc_iomux_set_pad(MX51_PIN_DI1_PIN12, GPIO_PAD_CFG);
-+
-+ /* PMIC SLEEP# */
-+ mxc_request_iomux(MX51_PIN_DISPB2_SER_CLK, IOMUX_CONFIG_ALT4);
-+ mxc_iomux_set_pad(MX51_PIN_DISPB2_SER_CLK, GPIO_PAD_CFG);
-+
-+ /* FPGA SUSPEND */
-+ mxc_request_iomux(MX51_PIN_DISPB2_SER_DIO, IOMUX_CONFIG_ALT4);
-+ mxc_iomux_set_pad(MX51_PIN_DISPB2_SER_DIO, GPIO_PAD_CFG);
-+
-+ /* PMIC OFF# */
-+ mxc_request_iomux(MX51_PIN_DISPB2_SER_RS, IOMUX_CONFIG_ALT4);
-+ mxc_iomux_set_pad(MX51_PIN_DISPB2_SER_RS, GPIO_PAD_CFG);
-+
-+ /* FPGA PROG */
-+ mxc_request_iomux(MX51_PIN_CSI2_D12, IOMUX_CONFIG_ALT3);
-+ mxc_iomux_set_pad(MX51_PIN_CSI2_D12, GPIO_PAD_CFG);
-+
-+ /* FPGA DONE */
-+ mxc_request_iomux(MX51_PIN_CSI2_D13, IOMUX_CONFIG_ALT3);
-+ mxc_iomux_set_pad(MX51_PIN_CSI2_D13, GPIO_PAD_CFG);
-+
-+ /* FPGA INIT# */
-+ mxc_request_iomux(MX51_PIN_CSI2_D18, IOMUX_CONFIG_ALT3);
-+ mxc_iomux_set_pad(MX51_PIN_CSI2_D18, GPIO_PAD_CFG);
-+
-+ /* Ethernet PHY Reset out */
-+ imx_gpio_pin_set(CONFIG_SYS_PHY_RESET_GPIO,1);
++ u32 gpio_num = IOMUX_TO_GPIO(pin);
++ u32 gpio_off = GPIO_TO_INDEX(gpio_num);
++ u32 baddr = PORT_BADDR(GPIO_TO_PORT(gpio_num));
+
++ return (__REG(baddr + GPIO_PSR) >> gpio_off) & 1;
+}
+
+
@@ -587,6 +631,11 @@ diff -purN u-boot-2010.03-ref/board/armadeus/apf51/apf51.c u-boot-2010.03/board/
+#define CFG_FEC_PAD (PAD_CTL_DRV_MEDIUM | PAD_CTL_PUE_KEEPER | \
+ PAD_CTL_HYS_ENABLE | PAD_CTL_DRV_VOT_HIGH)
+
++ /* Ethernet PHY Reset */
++ imx_gpio_pin_set(CONFIG_SYS_PHY_RESET_GPIO,0);
++ imx_gpio_pin_cfg_dir(CONFIG_SYS_PHY_RESET_GPIO, 1);
++ imx_gpio_pin_set(CONFIG_SYS_PHY_RESET_GPIO,1);
++
+ /* FEC TX_ER muxed with DI_GP3 */
+ mxc_request_iomux(MX51_PIN_DI_GP3, IOMUX_CONFIG_ALT2);
+ mxc_iomux_set_pad(MX51_PIN_DI_GP3, CFG_FEC_PAD);
@@ -800,9 +849,43 @@ diff -purN u-boot-2010.03-ref/board/armadeus/apf51/apf51.c u-boot-2010.03/board/
+ setup_eim();
+ setup_csi();
+ setup_keypad();
++#ifdef CONFIG_FPGA
++ setup_fpga();
++#endif
+ return 0;
+}
+
++/*
++ * Miscellaneous intialization
++ */
++int
++misc_init_r (void)
++{
++ char *s;
++ u_char * firmware_buffer = (u_char *)(CONFIG_SYS_LOAD_ADDR + CONFIG_SYS_MONITOR_LEN);
++ size_t end = 0;
++ size_t size = 0;
++ size_t offset = -1;
++ char *autoload = getenv ("firmware_autoload");
++
++#if defined(CONFIG_FPGA)
++ /* init and download fpga */
++/* if (( autoload ) && (0 == strcmp(autoload, "1"))) {
++ if ((s = getenv("firmware_offset")) != NULL) {
++ offset = simple_strtoul(s, NULL, 16);
++ }
++ if ((s = getenv("firmware_len")) != NULL) {
++ end = offset + simple_strtoul(s, NULL, 16);
++ }
++ if ((-1 != offset) && (offset != end)) {
++ size = read_firmware (offset, end, firmware_buffer);
++ }
++ }*/
++ APF51_init_fpga (firmware_buffer, size);
++#endif
++
++ return 0;
++}
+
+#ifdef BOARD_LATE_INIT
+int board_late_init(void)
@@ -1026,7 +1109,7 @@ diff -purN u-boot-2010.03-ref/board/armadeus/apf51/Makefile u-boot-2010.03/board
+
+LIB = $(obj)lib$(BOARD).a
+
-+COBJS := apf51.o
++COBJS := apf51.o fpga.o
+SOBJS :=
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
@@ -1172,3 +1255,311 @@ diff -purN u-boot-2010.03-ref/Makefile u-boot-2010.03/Makefile
at91cap9adk_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm926ejs at91cap9adk atmel at91
+diff -purN u-boot-2010.03-ref/board/armadeus/apf51/fpga.h u-boot-2010.03/board/armadeus/apf51/fpga.h
+--- u-boot-2010.03-ref/board/armadeus/apf51/fpga.h 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2010.03/board/armadeus/apf51/fpga.h 2010-09-16 22:10:12.000000000 +0200
+@@ -0,0 +1,39 @@
++/*
++ * (C) Copyright 2002-2010
++ * Eric Jarrige <eri...@ar...>
++ * Rich Ireland, Enterasys Networks, rir...@en....
++ * Keith Outwater, kei...@mv....
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * 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
++ *
++ */
++extern int APF51_init_fpga (u_char * buffer, size_t size);
++
++extern int fpga_pre_fn (int cookie);
++extern int fpga_pgm_fn (int assert_pgm, int flush, int cookie);
++extern int fpga_cs_fn (int assert_cs, int flush, int cookie);
++extern int fpga_init_fn (int cookie);
++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_rdata_fn ( unsigned char *data, int cookie );
++extern int fpga_wdata_fn ( unsigned char data, int cookie );
++extern int fpga_abort_fn (int cookie);
++extern int fpga_post_fn (int cookie);
++extern int fpga_busy_fn (int cookie);
+diff -purN u-boot-2010.03-ref/board/armadeus/apf51/fpga.c u-boot-2010.03/board/armadeus/apf51/fpga.c
+--- u-boot-2010.03-ref/board/armadeus/apf51/fpga.c 1970-01-01 01:00:00.000000000 +0100
++++ u-boot-2010.03/board/armadeus/apf51/fpga.c 2010-09-16 22:10:12.000000000 +0200
+@@ -0,0 +1,261 @@
++ /*
++ * (C) Copyright 2002-2010
++ * Nicolas Colombain <nic...@ar...>
++ * Rich Ireland, Enterasys Networks, rir...@en....
++ * Keith Outwater, kei...@mv....
++ *
++ * See file CREDITS for list of people who contributed to this
++ * project.
++ *
++ * 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
++ *
++ */
++ #include <common.h>
++
++ #if defined(CONFIG_FPGA)
++
++ #include <asm/arch/imx-regs.h>
++ #include <asm/arch/asm-offsets.h>
++ #include <asm/io.h>
++ #include <command.h>
++ #include <config.h>
++ #include <asm/arch/iomux.h>
++ #include "fpga.h"
++ #include <spartan3.h>
++
++ #ifdef FPGA_DEBUG
++ #define PRINTF(fmt,args...) printf (fmt ,##args)
++ #else
++ #define PRINTF(fmt,args...)
++ #endif
++
++ extern void imx_gpio_pin_set(unsigned int pin, int value);
++ extern void imx_gpio_pin_cfg_dir(unsigned int pin, int dir);
++ extern int imx_gpio_pin_get(unsigned int pin);
++
++ u32 temp_clk; /* use to restore the emi_clk_sel after donwload */
++
++ /* Note that these are pointers to code that is in Flash. They will be
++ * relocated at runtime.
++ * Spartan2 code is used to download our Spartan 6 :) code is compatible.
++ * Just take care about the file size
++ */
++ Xilinx_Spartan3_Slave_Parallel_fns fpga_fns = {
++ fpga_pre_fn,
++ fpga_pgm_fn,
++ fpga_init_fn,
++ NULL,
++ fpga_done_fn,
++ fpga_clk_fn,
++ fpga_cs_fn,
++ fpga_wr_fn,
++ fpga_rdata_fn,
++ fpga_wdata_fn,
++ fpga_busy_fn,
++ fpga_abort_fn,
++ fpga_post_fn,
++ };
++
++ Xilinx_desc fpga[CONFIG_FPGA_COUNT] = {
++ {Xilinx_Spartan3,
++ slave_parallel,
++ 3713568l/8,
++ (void *) &fpga_fns,
++ 0}
++ };
++
++ /*
++ *
++ */
++ int
++ fpga_pre_fn (int cookie)
++ {
++ #define EMI_CLK_SEL 1<<26
++
++ /* change emi_clk_sel to ensure blck smaller than 50MHz */
++ temp_clk = __REG(CCM_BASE_ADDR + CLKCTL_CBCDR);
++ __REG(CCM_BASE_ADDR + CLKCTL_CBCDR) = temp_clk | EMI_CLK_SEL;
++
++ /* FPGA PROG */
++ imx_gpio_pin_set(CONFIG_SYS_FPGA_PRG, 1);
++ imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_PRG, 1);
++
++ /* FPGA PWR */
++ imx_gpio_pin_set(CONFIG_SYS_FPGA_PWR, 1);
++ imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_PWR, 1);
++
++ printf("Enable fpga power\n");
++
++ /* FPGA SUSPEND */
++ imx_gpio_pin_set(CONFIG_SYS_FPGA_SUSPEND, 1);
++ imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_SUSPEND, 1);
++
++ /* FPGA DONE */
++ imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_DONE, 0);
++
++ /* FPGA INIT# */
++ imx_gpio_pin_cfg_dir(CONFIG_SYS_FPGA_INIT, 0);
++
++ return cookie;
++ }
++
++ /*
++ * Set the FPGA's active-low program line to the specified level
++ */
++ int
++ fpga_pgm_fn (int assert, int flush, int cookie)
++ {
++ PRINTF ("%s:%d: FPGA PROGRAM %s\n", __FUNCTION__, __LINE__,
++ assert?"high":"low");
++ imx_gpio_pin_set( CONFIG_SYS_FPGA_PRG, !assert);
++ return assert;
++ }
++
++ /*
++ * Set the FPGA's active-high clock line to the specified level
++ */
++ int
++ fpga_clk_fn (int assert_clk, int flush, int cookie)
++ {
++ return assert_clk;
++ }
++
++ /*
++ * Test the state of the active-low FPGA INIT line. Return 1 on INIT
++ * asserted (low).
++ */
++ int
++ fpga_init_fn (int cookie)
++ {
++ int value;
++ PRINTF ("%s:%d: INIT check... \n", __FUNCTION__, __LINE__);
++ value = imx_gpio_pin_get(CONFIG_SYS_FPGA_INIT);
++ PRINTF ("init value read %x\n",value);
++ if (value)
++ return 0;
++ return 1;
++ }
++
++ /*
++ * Test the state of the active-high FPGA DONE pin
++ */
++ int
++ fpga_done_fn (int cookie)
++ {
++ int value;
++ value = imx_gpio_pin_get(CONFIG_SYS_FPGA_DONE);
++ PRINTF ("%s:%d: DONE check... %s", __FUNCTION__, __LINE__,
++ value?"high":"low");
++ return(value?FPGA_SUCCESS:FPGA_FAIL);
++ }
++
++ /*
++ * Set the FPGA's wr line to the specified level
++ */
++ int
++ fpga_wr_fn (int assert_write, int flush, int cookie)
++ {
++ return assert_write;
++ }
++
++ int
++ fpga_cs_fn (int assert_cs, int flush, int cookie)
++ {
++ return assert_cs;
++ }
++
++ int
++ fpga_rdata_fn ( unsigned char *data, int cookie )
++ {
++ PRINTF ("%s:%d: FPGA READ DATA %02X \n", __FUNCTION__, __LINE__,
++ *((char*)CONFIG_SYS_FPGA_RDATA));
++ *data = (unsigned char)((*((unsigned short*)CONFIG_SYS_FPGA_RDATA))&0x00FF);
++ return *data;
++ }
++
++ int
++ fpga_wdata_fn ( unsigned char data, int cookie )
++ {
++ PRINTF ("%s:%d: FPGA WRITE DATA %02X \n", __FUNCTION__, __LINE__,
++ data);
++ static u32 temp;
++ static u32 index = 0;
++
++ switch( index++ ){
++ case 0: temp = data << 8; break;
++ case 1: temp = temp + data; break;
++ case 2: temp = temp + (data << 24); break;
++ default:
++ *((volatile unsigned long*)CONFIG_SYS_FPGA_WDATA) = temp + (data << 16);
++ index = 0;
++ break;
++ }
++
++ return data;
++ }
++
++ int
++ fpga_abort_fn ( int cookie )
++ {
++ return cookie;
++ }
++
++
++ int
++ fpga_busy_fn ( int cookie )
++ {
++ return 1;
++ }
++
++ int
++ fpga_post_fn (int cookie)
++ {
++ PRINTF ("%s:%d: FPGA POST \n", __FUNCTION__, __LINE__);
++ /* restore emi_clk_sel */
++ __REG(CCM_BASE_ADDR + CLKCTL_CBCDR) = temp_clk;
++
++ return cookie;
++ }
++
++ /*
++ * Initialize the fpga. Return 1 on success, 0 on failure.
++ */
++ int
++ APF51_init_fpga (u_char * buffer, size_t size)
++ {
++ char *autoload = getenv ("firmware_autoload");
++
++ int i,lout=0;
++
++ fpga_init();
++
++ for (i = 0; i < CONFIG_FPGA_COUNT; i++) {
++ PRINTF ("%s:%d: Adding fpga %d\n", __FUNCTION__, __LINE__, i);
++ fpga_add (fpga_xilinx, &fpga[i]);
++ }
++
++ if ((size >= fpga[0].size) && ( autoload ) && (0 == strcmp(autoload, "1"))) {
++ if (FPGA_SUCCESS != fpga_load( 0, (void *)buffer, size )) {
++ lout = 1;
++ printf("Firmware download failed!\n");
++ }
++ else
++ printf("Firmware successfully programmed\n");
++ }
++ return lout;
++ }
++
++ #endif /* CONFIG_FPGA */
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-11-26 10:26:43
|
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 a9b0e585dcbf3dc6811b43352d13de9377f7b5d3 (commit)
from 713a40d8c2ba0de79c93d7d4f097f42ad666cb2a (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 a9b0e585dcbf3dc6811b43352d13de9377f7b5d3
Author: nicolas colombain <nic...@ar...>
Date: Fri Nov 26 11:26:01 2010 +0100
[U-BOOT] add fpga support
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 31 +++++++++----------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index 0f0103d..014c4c4 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -41,7 +41,7 @@
* dependent initialization.
*/
-//#define CONFIG_MISC_INIT_R
+#define CONFIG_MISC_INIT_R
/*
* BOOTP options
@@ -569,9 +569,9 @@
#define CONFIG_DISCOVER_PHY
/*-----------------------------------------------------------------------
- * FPGA stuff TODO TODO TODO TODO TODO TODO TODO TODO
+ * FPGA
*/
-//#define CONFIG_FPGA CONFIG_SYS_SPARTAN3
+#define CONFIG_FPGA CONFIG_SYS_SPARTAN3
//#define FPGA_DEBUG
#define CONFIG_FPGA_COUNT 1
#define CONFIG_FPGA_XILINX
@@ -580,20 +580,15 @@
#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*/
/* FPGA program pin configuration */
-#define CONFIG_SYS_FPGA_PWR (GPIO_PORTF | 19) /* FPGA prog pin */
-#define CONFIG_SYS_FPGA_PRG (GPIO_PORTF | 11) /* FPGA prog pin */
-#define CONFIG_SYS_FPGA_CLK (GPIO_PORTF | 15) /* FPGA clk pin */
-#define CONFIG_SYS_FPGA_RDATA 0xD6000000 /* FPGA data addr */
-#define CONFIG_SYS_FPGA_WDATA 0xD6000000 /* FPGA data addr */
-#define CONFIG_SYS_FPGA_INIT (GPIO_PORTF | 12) /* FPGA init pin */
-#define CONFIG_SYS_FPGA_DONE (GPIO_PORTF | 9) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_RW (GPIO_PORTF | 21) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_CS (GPIO_PORTF | 22) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_SUSPEND (GPIO_PORTF | 10) /* FPGA done pin */
-#define CONFIG_SYS_FPGA_RESET (GPIO_PORTF | 7) /* FPGA done pin */
+#define CONFIG_SYS_FPGA_PWR MX51_PIN_DI1_D0_CS
+#define CONFIG_SYS_FPGA_PRG MX51_PIN_CSI2_D12
+#define CONFIG_SYS_FPGA_RDATA CS1_BASE_ADDR
+#define CONFIG_SYS_FPGA_WDATA CS1_BASE_ADDR
+#define CONFIG_SYS_FPGA_INIT MX51_PIN_CSI2_D18
+#define CONFIG_SYS_FPGA_DONE MX51_PIN_CSI2_D13
+#define CONFIG_SYS_FPGA_SUSPEND MX51_PIN_DISPB2_SER_DIO
/**
* I2C Configs TODO TODO TODO TODO
@@ -657,7 +652,7 @@
*/
#define CONFIG_SYS_SDRAM_1_SIZE (CONFIG_SYS_SDRAM_MBYTE_SYZE) * 1024 * 1024
#define CONFIG_SYS_SDRAM_2_SIZE (CONFIG_SYS_SDRAM_MBYTE_SYZE) * 1024 * 1024
-#define CONFIG_NR_DRAM_BANKS CONFIG_SYS_NR_DRAM_BANKS /* not an option anyway */
+#define CONFIG_NR_DRAM_BANKS 1
#ifdef CONFIG_SYS_SDRAM_TYPE_MDDR
#if (CONFIG_SYS_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
@@ -1017,3 +1012,7 @@
#endif /* __CONFIG_H */
+#ifdef CONFIG_BOARD_NAME
+#undef CONFIG_BOARD_NAME
+#endif
+#define CONFIG_BOARD_NAME apf51
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2010-11-26 09:31:05
|
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 713a40d8c2ba0de79c93d7d4f097f42ad666cb2a (commit)
from 06e4e863ed918a4a0e042f8c7d57b148501d55e1 (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 713a40d8c2ba0de79c93d7d4f097f42ad666cb2a
Author: nicolas colombain <nic...@ar...>
Date: Fri Nov 26 10:30:06 2010 +0100
[LINUX] add APF51 patch comments
-----------------------------------------------------------------------
Summary of changes:
.../2.6.36/401-armadeus-fix_clock_tree.patch | 6 ++++++
.../2.6.36/402-armadeus-add_nand_device.patch | 4 ++++
.../2.6.36/403-armadeus-set-uart2-debug.patch | 4 ++++
.../2.6.36/404-armadeus-fix_nand_ecc_oob.patch | 4 ++++
4 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/401-armadeus-fix_clock_tree.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/401-armadeus-fix_clock_tree.patch
index 81697e7..37fcf66 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/401-armadeus-fix_clock_tree.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/401-armadeus-fix_clock_tree.patch
@@ -1,3 +1,9 @@
+Change default clock source for the APF51.
+No external HCLK is required.
+Patch has to be reworked to support selection from the platform
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
Index: linux-2.6.36/arch/arm/mach-mx5/clock-mx51.c
===================================================================
--- linux-2.6.36.orig/arch/arm/mach-mx5/clock-mx51.c 2010-10-20 22:30:22.000000000 +0200
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/402-armadeus-add_nand_device.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/402-armadeus-add_nand_device.patch
index 74579c4..208684c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/402-armadeus-add_nand_device.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/402-armadeus-add_nand_device.patch
@@ -1,3 +1,7 @@
+Add NAND device to MX5 architecture
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
Index: linux-2.6.36/arch/arm/mach-mx5/devices.h
===================================================================
--- linux-2.6.36.orig/arch/arm/mach-mx5/devices.h 2010-10-20 22:30:22.000000000 +0200
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/403-armadeus-set-uart2-debug.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/403-armadeus-set-uart2-debug.patch
index 26e4c1c..2cbec23 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/403-armadeus-set-uart2-debug.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/403-armadeus-set-uart2-debug.patch
@@ -1,3 +1,7 @@
+Change default debug UART for APF51
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/debug-macro.S
===================================================================
--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/debug-macro.S 2010-10-20 22:30:22.000000000 +0200
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/404-armadeus-fix_nand_ecc_oob.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/404-armadeus-fix_nand_ecc_oob.patch
index 52e0789..42619a9 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/404-armadeus-fix_nand_ecc_oob.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/404-armadeus-fix_nand_ecc_oob.patch
@@ -1,3 +1,7 @@
+Add OOB and bad block table management to the V3 mxc_nand driver
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
Index: linux-2.6.36/drivers/mtd/nand/mxc_nand.c
===================================================================
--- linux-2.6.36.orig/drivers/mtd/nand/mxc_nand.c 2010-11-14 12:33:43.000000000 +0100
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-25 21:55: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 06e4e863ed918a4a0e042f8c7d57b148501d55e1 (commit)
via d5ea2327c9cffb100593ca3d5c791944b7ee2849 (commit)
via a4dda0c609397dc9cd04298f5f7376dbbe968b02 (commit)
from 61c0653029aa4b195049c5e570bc16a8c84ff56e (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 06e4e863ed918a4a0e042f8c7d57b148501d55e1
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 22:53:38 2010 +0100
[LINUX] 2.6.36: Activates Ethernet on APF27
commit d5ea2327c9cffb100593ca3d5c791944b7ee2849
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 20:44:50 2010 +0100
[LINUX] 2.6.36: import patches 322 & 323 from 2.6.29
commit a4dda0c609397dc9cd04298f5f7376dbbe968b02
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 20:10:35 2010 +0100
[LINUX] rename 337b-armadeus-imxfb-add_backlight_power_switch_capability.patch to 337b-armadeus-mx2fb-add_backlight_power_switch_capability.patch
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.36.config | 27 +++++++++++++++++--
...fb-add_backlight_power_switch_capability.patch} | 5 +++
.../2.6.36/281-apf27-armadeus-add_apf27.c.patch | 25 ++++++++++--------
.../322-apf27-armadeus-add_mach_fpga_h.patch | 4 +-
...apf27-armadeus-increases_board_irq_number.patch | 17 ++++++++++++
5 files changed, 62 insertions(+), 16 deletions(-)
rename buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/{337b-armadeus-imxfb-add_backlight_power_switch_capability.patch => 337b-armadeus-mx2fb-add_backlight_power_switch_capability.patch} (90%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/322-apf27-armadeus-add_mach_fpga_h.patch (91%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/323-apf27-armadeus-increases_board_irq_number.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
index 9832c7b..83916f6 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36
-# Thu Nov 25 15:52:57 2010
+# Thu Nov 25 20:52:40 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -751,7 +751,27 @@ CONFIG_NETDEVICES=y
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
-# CONFIG_PHYLIB is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
CONFIG_NET_ETHERNET=y
# CONFIG_MII is not set
# CONFIG_AX88796 is not set
@@ -772,7 +792,8 @@ CONFIG_NET_ETHERNET=y
# CONFIG_B44 is not set
# CONFIG_KS8851 is not set
# CONFIG_KS8851_MLL is not set
-# CONFIG_FEC is not set
+CONFIG_FEC=y
+# CONFIG_FEC2 is not set
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
CONFIG_WLAN=y
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-imxfb-add_backlight_power_switch_capability.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-mx2fb-add_backlight_power_switch_capability.patch
similarity index 90%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-imxfb-add_backlight_power_switch_capability.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-mx2fb-add_backlight_power_switch_capability.patch
index 788d321..d393756 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-imxfb-add_backlight_power_switch_capability.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/337b-armadeus-mx2fb-add_backlight_power_switch_capability.patch
@@ -1,3 +1,8 @@
+Add the capability to Freescale MX2 framebuffer to power on/off LCD's
+backlight.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
Index: linux-2.6.29.6/arch/arm/plat-mxc/include/mach/imx_fb.h
===================================================================
--- linux-2.6.29.6.orig/arch/arm/plat-mxc/include/mach/imx_fb.h 2010-01-27 18:50:48.000000000 +0100
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch
index c435dbe..73b576e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/281-apf27-armadeus-add_apf27.c.patch
@@ -9,8 +9,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27.c 2010-11-09 10:13:43.000000000 +0100
-@@ -0,0 +1,802 @@
++++ linux-2.6.36/arch/arm/mach-imx/apf27.c 2010-11-25 20:54:01.000000000 +0100
+@@ -0,0 +1,805 @@
+ /*
+ * apf27.c
+ *
@@ -220,7 +220,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+
+
+/* APF27 has an onboard Ethernet PHY */
-+#ifdef CONFIG_FEC_OLD
++#ifdef CONFIG_FEC
+static int mxc_fec_pins[] = {
+ PD0_AIN_FEC_TXD0,
+ PD1_AIN_FEC_TXD1,
@@ -236,7 +236,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ PD11_AOUT_FEC_TX_CLK,
+ PD12_AOUT_FEC_RXD0,
+ PD13_AOUT_FEC_RX_DV,
-+ PD14_AOUT_FEC_CLR,
++ PD14_AOUT_FEC_RX_CLK,
+ PD15_AOUT_FEC_COL,
+ PD16_AIN_FEC_TX_ER,
+ PF23_AIN_FEC_TX_EN
@@ -246,7 +246,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+{
+ mxc_gpio_setup_multiple_pins(mxc_fec_pins, ARRAY_SIZE(mxc_fec_pins), "FEC");
+}
-+#endif /* CONFIG_FEC_OLD */
++#endif /* CONFIG_FEC */
+
+#if 0
+/* APF27 has an onboard PHY (ISP1504) on OTG USB port */
@@ -554,6 +554,9 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+#ifdef CONFIG_MXC_VPU
+ &mxc_vpu_device,
+#endif
++#ifdef CONFIG_FEC
++ &mxc_fec_device,
++#endif
+};
+
+
@@ -747,7 +750,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
+ /* Init APF27 power management related pins */
+ apf27_pwr_ctl_active();
+
-+#ifdef CONFIG_FEC_OLD
++#ifdef CONFIG_FEC
+ gpio_fec_active();
+#endif
+ /* UART1 and UART3 have "on module" transceivers */
@@ -816,7 +819,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27.c
Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27-dev.c 2010-11-08 16:15:38.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-imx/apf27-dev.c 2010-11-25 19:29:57.000000000 +0100
@@ -0,0 +1,1155 @@
+ /*
+ * apf27-dev.c
@@ -1976,7 +1979,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev.c
Index: linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c 2010-11-08 16:17:07.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c 2010-11-25 19:29:57.000000000 +0100
@@ -0,0 +1,222 @@
+/*
+ * apf27-lcd.c
@@ -2203,7 +2206,7 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-lcd.c
Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c 2010-11-07 19:07:30.000000000 +0100
++++ linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c 2010-11-25 19:29:57.000000000 +0100
@@ -0,0 +1,190 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -2397,8 +2400,8 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf27-dev-ext-apw.c
+
Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-08 15:21:56.000000000 +0100
-+++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-08 15:22:22.000000000 +0100
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-25 20:58:31.000000000 +0100
@@ -81,6 +81,7 @@
case MACH_TYPE_MX21ADS:
case MACH_TYPE_PCA100:
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/322-apf27-armadeus-add_mach_fpga_h.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/322-apf27-armadeus-add_mach_fpga_h.patch
similarity index 91%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/322-apf27-armadeus-add_mach_fpga_h.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/322-apf27-armadeus-add_mach_fpga_h.patch
index 1e129a6..b6f4507 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/322-apf27-armadeus-add_mach_fpga_h.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/322-apf27-armadeus-add_mach_fpga_h.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.29.4/arch/arm/plat-mxc/include/mach/fpga.h
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/plat-mxc/include/mach/fpga.h 2009-06-08 17:40:21.000000000 +0200
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/fpga.h 2010-11-25 20:23:44.000000000 +0100
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2009 Armadeus Systems
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/323-apf27-armadeus-increases_board_irq_number.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/323-apf27-armadeus-increases_board_irq_number.patch
new file mode 100644
index 0000000..99995aa
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/323-apf27-armadeus-increases_board_irq_number.patch
@@ -0,0 +1,17 @@
+Increases board reserved interrupts to 32. This is needed for the APF27 FPGA.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/irqs.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/irqs.h 2010-11-25 20:27:40.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/irqs.h 2010-11-25 20:28:54.000000000 +0100
+@@ -47,6 +47,8 @@
+
+ #ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
+ #define MXC_BOARD_IRQS 80
++#elif defined CONFIG_MACH_APF27
++#define MXC_BOARD_IRQS 32
+ #else
+ #define MXC_BOARD_IRQS 16
+ #endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-25 18:28: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 61c0653029aa4b195049c5e570bc16a8c84ff56e (commit)
via 05670a00c15593ba32fc3d9ee436a4c6b3bdd2b6 (commit)
from 3823b7c064b2118c46dfd029f28fd44d12917379 (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 61c0653029aa4b195049c5e570bc16a8c84ff56e
Merge: 05670a00c15593ba32fc3d9ee436a4c6b3bdd2b6 3823b7c064b2118c46dfd029f28fd44d12917379
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 19:27:37 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 05670a00c15593ba32fc3d9ee436a4c6b3bdd2b6
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 19:27:20 2010 +0100
[LINUX] 2.6.36: import patches 330, 331, 333 & 339 from 2.6.29
-----------------------------------------------------------------------
Summary of changes:
...add_platform_data_init_support_to_spidev.patch} | 0
...-imxfb-power_on_backlight_after_lcd_logic.patch | 8 +++---
...-makes_setpalettereg_compatible_with_mx27.patch | 8 +++---
...mx2_bit_per_pixel_selection_in_PCR_fields.patch | 23 ++++++++++++++++++++
...add_platform_data_init_support_to_spidev.patch} | 20 ++++++++--------
5 files changed, 41 insertions(+), 18 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/{339-apf27-armadeus-spidev.patch => 339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch} (100%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch (73%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch (78%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/333-armadeus-imxfb-makes_distinction_between_mx1_and_mx2_bit_per_pixel_selection_in_PCR_fields.patch
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29/339-apf27-armadeus-spidev.patch => 2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch} (62%)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
similarity index 100%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
similarity index 73%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
index 8e09faa..013c431 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
@@ -5,11 +5,11 @@ will be seen.
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29.4/drivers/video/imxfb.c
+Index: linux-2.6.36/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.4.orig/drivers/video/imxfb.c 2009-06-04 11:24:55.000000000 +0200
-+++ linux-2.6.29.4/drivers/video/imxfb.c 2009-06-04 11:28:59.000000000 +0200
-@@ -397,10 +397,10 @@
+--- linux-2.6.36.orig/drivers/video/imxfb.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/video/imxfb.c 2010-11-25 17:46:43.000000000 +0100
+@@ -542,10 +542,10 @@
clk_enable(fbi->clk);
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
similarity index 78%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
index 16741a4..a696083 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
@@ -3,11 +3,11 @@ On i.MX2(1/7) color palette registers are 18 bits wide for TFT display's modes.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/drivers/video/imxfb.c
+Index: linux-2.6.36/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-06-01 14:39:03.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-06-01 15:49:54.000000000 +0200
-@@ -221,12 +221,17 @@
+--- linux-2.6.36.orig/drivers/video/imxfb.c 2010-11-25 17:46:43.000000000 +0100
++++ linux-2.6.36/drivers/video/imxfb.c 2010-11-25 18:03:18.000000000 +0100
+@@ -244,12 +244,17 @@
{
struct imxfb_info *fbi = info->par;
u_int val, ret = 1;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/333-armadeus-imxfb-makes_distinction_between_mx1_and_mx2_bit_per_pixel_selection_in_PCR_fields.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/333-armadeus-imxfb-makes_distinction_between_mx1_and_mx2_bit_per_pixel_selection_in_PCR_fields.patch
new file mode 100644
index 0000000..0f8a558
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/333-armadeus-imxfb-makes_distinction_between_mx1_and_mx2_bit_per_pixel_selection_in_PCR_fields.patch
@@ -0,0 +1,23 @@
+
+On i.MXL bits per pixel selection in LCD controller's PCR register is slightly
+different than on i.MX2+, so mark this difference.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2010-11-25 18:27:50.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/imxfb.h 2010-11-25 18:28:45.000000000 +0100
+@@ -15,8 +15,12 @@
+ #define PCR_BPIX_4 (2 << 25)
+ #define PCR_BPIX_8 (3 << 25)
+ #define PCR_BPIX_12 (4 << 25)
++#ifdef CONFIG_ARCH_MX1
++#define PCR_BPIX_16 (4 << 25)
++#else
+ #define PCR_BPIX_16 (5 << 25)
+ #define PCR_BPIX_18 (6 << 25)
++#endif
+ #define PCR_PIXPOL (1 << 24)
+ #define PCR_FLMPOL (1 << 23)
+ #define PCR_LPPOL (1 << 22)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
similarity index 62%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
index ec7012c..9b412f4 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/339-apf27-armadeus-spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
@@ -4,19 +4,19 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
---
-Index: linux-2.6.29.6/drivers/spi/spidev.c
+Index: linux-2.6.36/drivers/spi/spidev.c
===================================================================
---- linux-2.6.29.6.orig/drivers/spi/spidev.c 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/spi/spidev.c 2010-01-19 14:37:18.000000000 +0100
-@@ -558,6 +558,7 @@
+--- linux-2.6.36.orig/drivers/spi/spidev.c 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/spi/spidev.c 2010-11-25 19:22:06.000000000 +0100
+@@ -560,6 +560,7 @@
- static int spidev_probe(struct spi_device *spi)
+ static int __devinit spidev_probe(struct spi_device *spi)
{
+ struct spidev_platform_data *pdata = spi->dev.platform_data;
struct spidev_data *spidev;
int status;
unsigned long minor;
-@@ -595,6 +596,10 @@
+@@ -597,6 +598,10 @@
set_bit(minor, minors);
list_add(&spidev->device_entry, &device_list);
}
@@ -27,11 +27,11 @@ Index: linux-2.6.29.6/drivers/spi/spidev.c
mutex_unlock(&device_list_lock);
if (status == 0)
-Index: linux-2.6.29.6/include/linux/spi/spidev.h
+Index: linux-2.6.36/include/linux/spi/spidev.h
===================================================================
---- linux-2.6.29.6.orig/include/linux/spi/spidev.h 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/include/linux/spi/spidev.h 2010-01-19 14:37:18.000000000 +0100
-@@ -101,6 +101,10 @@
+--- linux-2.6.36.orig/include/linux/spi/spidev.h 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/include/linux/spi/spidev.h 2010-11-25 19:22:06.000000000 +0100
+@@ -103,6 +103,10 @@
*/
};
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-11-25 16:56: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 3823b7c064b2118c46dfd029f28fd44d12917379 (commit)
from 99e581b3a12fe5dd45b9a3e953148b49ef11908f (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 3823b7c064b2118c46dfd029f28fd44d12917379
Author: Fabien Marteau <fab...@ar...>
Date: Thu Nov 25 17:56:37 2010 +0100
[linux][2.6.36] adding AS5011 driver in kernel 2.6.36
-----------------------------------------------------------------------
Summary of changes:
...us-joystick-adding_as5011_joystick_driver.patch | 22 ++++++++++----------
1 files changed, 11 insertions(+), 11 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.36}/359-armadeus-joystick-adding_as5011_joystick_driver.patch (94%)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/359-armadeus-joystick-adding_as5011_joystick_driver.patch
similarity index 94%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/359-armadeus-joystick-adding_as5011_joystick_driver.patch
index 4709a7f..958dd72 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/359-armadeus-joystick-adding_as5011_joystick_driver.patch
@@ -2,10 +2,10 @@ Adding Austria Microsystem AS5011 joystick driver
Signed-off-by: Fabien Marteau <fab...@ar...>
-Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+Index: linux-2.6.36/drivers/input/joystick/as5011.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-11-25 12:28:08.000000000 +0100
++++ linux-2.6.36/drivers/input/joystick/as5011.c 2010-11-25 17:47:25.000000000 +0100
@@ -0,0 +1,427 @@
+/*
+ * Copyright (c) 2010 Fabien Marteau <fab...@ar...>
@@ -434,11 +434,11 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+
+module_init(as5011_init);
+module_exit(as5011_exit);
-Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
+Index: linux-2.6.36/drivers/input/joystick/Kconfig
===================================================================
---- linux-2.6.29.6.orig/drivers/input/joystick/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-11-23 17:43:25.000000000 +0100
-@@ -254,6 +254,15 @@
+--- linux-2.6.36.orig/drivers/input/joystick/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/input/joystick/Kconfig 2010-11-25 17:47:25.000000000 +0100
+@@ -255,6 +255,15 @@
To compile this driver as a module, choose M here: the
module will be called amijoy.
@@ -454,10 +454,10 @@ Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
config JOYSTICK_JOYDUMP
tristate "Gameport data dumper"
select GAMEPORT
-Index: linux-2.6.29.6/drivers/input/joystick/Makefile
+Index: linux-2.6.36/drivers/input/joystick/Makefile
===================================================================
---- linux-2.6.29.6.orig/drivers/input/joystick/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-11-23 17:43:25.000000000 +0100
+--- linux-2.6.36.orig/drivers/input/joystick/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/input/joystick/Makefile 2010-11-25 17:47:25.000000000 +0100
@@ -7,6 +7,7 @@
obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
obj-$(CONFIG_JOYSTICK_ADI) += adi.o
@@ -466,10 +466,10 @@ Index: linux-2.6.29.6/drivers/input/joystick/Makefile
obj-$(CONFIG_JOYSTICK_ANALOG) += analog.o
obj-$(CONFIG_JOYSTICK_COBRA) += cobra.o
obj-$(CONFIG_JOYSTICK_DB9) += db9.o
-Index: linux-2.6.29.6/include/linux/as5011.h
+Index: linux-2.6.36/include/linux/as5011.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/linux/as5011.h 2010-11-23 17:43:25.000000000 +0100
++++ linux-2.6.36/include/linux/as5011.h 2010-11-25 17:47:25.000000000 +0100
@@ -0,0 +1,72 @@
+#ifndef _AS5011_H
+#define _AS5011_H
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-25 15:09:26
|
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 99e581b3a12fe5dd45b9a3e953148b49ef11908f (commit)
via 259637465143ead1b3787a33d5a961a40ea76251 (commit)
from c6958ce294c144df9013b117c5596cd09bbd973f (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 99e581b3a12fe5dd45b9a3e953148b49ef11908f
Merge: 259637465143ead1b3787a33d5a961a40ea76251 c6958ce294c144df9013b117c5596cd09bbd973f
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 16:09:02 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 259637465143ead1b3787a33d5a961a40ea76251
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 16:08:44 2010 +0100
[LINUX] 2.6.36: makes I2C usable on APF27 (module & baseboards)
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.36.config | 5 +++--
...-apf27-armadeus-add_apf27_to_build_system.patch | 13 ++++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
index c448d08..9832c7b 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36
-# Sat Nov 6 21:12:40 2010
+# Thu Nov 25 15:52:57 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -259,6 +259,7 @@ CONFIG_MACH_MX27=y
# CONFIG_MACH_MXT_TD60 is not set
CONFIG_MACH_APF27=y
# CONFIG_MACH_APF27_FPGA is not set
+CONFIG_MACH_APF27_HAS_BASEBOARD=y
CONFIG_MACH_APF27_DEV=y
CONFIG_MACH_APF27_DEV_EXT_NONE=y
# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
@@ -989,7 +990,7 @@ CONFIG_I2C_HELPER_AUTO=y
#
# CONFIG_I2C_DESIGNWARE is not set
# CONFIG_I2C_GPIO is not set
-# CONFIG_I2C_IMX is not set
+CONFIG_I2C_IMX=y
# CONFIG_I2C_OCORES is not set
# CONFIG_I2C_PCA_PLATFORM is not set
# CONFIG_I2C_SIMTEC is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch
index 1448737..82ef489 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/282-apf27-armadeus-add_apf27_to_build_system.patch
@@ -1,8 +1,8 @@
Index: linux-2.6.36/arch/arm/mach-imx/Kconfig
===================================================================
---- linux-2.6.36.orig/arch/arm/mach-imx/Kconfig 2010-11-08 16:43:19.000000000 +0100
-+++ linux-2.6.36/arch/arm/mach-imx/Kconfig 2010-11-08 16:44:46.000000000 +0100
-@@ -191,4 +191,112 @@
+--- linux-2.6.36.orig/arch/arm/mach-imx/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-imx/Kconfig 2010-11-25 15:52:28.000000000 +0100
+@@ -191,4 +191,115 @@
Include support for i-MXT (aka td60) platform. This
includes specific configurations for the module and its peripherals.
@@ -25,6 +25,9 @@ Index: linux-2.6.36/arch/arm/mach-imx/Kconfig
+ help
+ Select this if your APF27 has an onboard FPGA.
+
++config MACH_APF27_HAS_BASEBOARD
++ bool
++
+choice
+ prompt "Baseboard"
+ depends on MACH_APF27
@@ -117,8 +120,8 @@ Index: linux-2.6.36/arch/arm/mach-imx/Kconfig
endif
Index: linux-2.6.36/arch/arm/mach-imx/Makefile
===================================================================
---- linux-2.6.36.orig/arch/arm/mach-imx/Makefile 2010-11-08 16:43:19.000000000 +0100
-+++ linux-2.6.36/arch/arm/mach-imx/Makefile 2010-11-08 16:43:26.000000000 +0100
+--- linux-2.6.36.orig/arch/arm/mach-imx/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-imx/Makefile 2010-11-25 15:29:44.000000000 +0100
@@ -31,3 +31,7 @@
obj-$(CONFIG_MACH_EUKREA_MBIMX27_BASEBOARD) += eukrea_mbimx27-baseboard.o
obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-11-25 11:40:22
|
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 c6958ce294c144df9013b117c5596cd09bbd973f (commit)
via 7f7b463c84f1aeeffc2c632be9ef630dcfa38789 (commit)
from d701edd3422ebb660b610c7f58e806b9aa7f6fc8 (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 c6958ce294c144df9013b117c5596cd09bbd973f
Merge: 7f7b463c84f1aeeffc2c632be9ef630dcfa38789 d701edd3422ebb660b610c7f58e806b9aa7f6fc8
Author: Fabien Marteau <fab...@ar...>
Date: Thu Nov 25 12:39:54 2010 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 7f7b463c84f1aeeffc2c632be9ef630dcfa38789
Author: Fabien Marteau <fab...@ar...>
Date: Thu Nov 25 12:39:41 2010 +0100
[linux] Better error label in as5011 joystick driver
-----------------------------------------------------------------------
Summary of changes:
...us-joystick-adding_as5011_joystick_driver.patch | 60 ++++++++++----------
1 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
index d587b63..4709a7f 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
@@ -5,8 +5,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-11-25 11:06:56.000000000 +0100
-@@ -0,0 +1,429 @@
++++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-11-25 12:28:08.000000000 +0100
+@@ -0,0 +1,427 @@
+/*
+ * Copyright (c) 2010 Fabien Marteau <fab...@ar...>
+ *
@@ -33,6 +33,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * TODO:
++ * - Use threaded IRQ instead of Hard IRQ
+ * - Manage power mode
+ */
+
@@ -190,7 +191,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ if (plat_dat->workqueue == NULL) {
+ dev_err(&client->dev, "Failed to create workqueue\n");
+ retval = -EINVAL;
-+ goto workqueue_create_error;
++ goto err_out;
+ }
+
+ INIT_WORK(&plat_dat->update_axes_work, as5011_update_axes);
@@ -200,7 +201,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ dev_err(&client->dev,
+ "i2c bus does not support protocol mangling, as5011 can't work\n");
+ retval = -ENODEV;
-+ goto i2c_protocol_error;
++ goto err_destroy_worqueue;
+ }
+ plat_dat->i2c_client = client;
+
@@ -209,7 +210,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ dev_err(&client->dev,
+ "not enough memory for input devices structure\n");
+ retval = -ENOMEM;
-+ goto input_allocate_device_error;
++ goto err_destroy_worqueue;
+ }
+
+ plat_dat->input_dev->name = "Austria Microsystem as5011 joystick";
@@ -238,7 +239,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ dev_err(&client->dev,
+ "not enough memory for input devices irq name\n");
+ retval = -ENOMEM;
-+ goto input_allocate_device_name_error;
++ goto err_input_free_device;
+ }
+
+ scnprintf(plat_dat->button_irq_name,
@@ -255,7 +256,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ dev_err(&client->dev, "Can't allocate irq %d\n",
+ plat_dat->button_irq);
+ retval = -EBUSY;
-+ goto request_irq_error;
++ goto err_free_button_irq_name;
+ }
+
+ plat_dat->int_irq_name = kmalloc(SIZE_NAME, GFP_KERNEL);
@@ -263,7 +264,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ dev_err(&client->dev,
+ "not enough memory for input devices int irq name\n");
+ retval = -ENOMEM;
-+ goto input_allocate_int_device_name_error;
++ goto err_free_irq_button_interrupt;
+ }
+
+ scnprintf(plat_dat->int_irq_name,
@@ -276,7 +277,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ dev_err(&client->dev, "Can't allocate int irq %d\n",
+ plat_dat->int_irq);
+ retval = -EBUSY;
-+ goto request_int_irq_error;
++ goto err_free_int_irq_name;
+ }
+
+
@@ -284,7 +285,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ retval = plat_dat->init_gpio();
+ if (retval < 0) {
+ dev_err(&client->dev, "Failed to init gpios\n");
-+ goto init_gpio_error;
++ goto err_free_irq_int;
+ }
+ }
+
@@ -295,7 +296,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
+ "Soft reset failed\n");
-+ goto soft_reset_error;
++ goto err_exit_gpio;
+ }
+
+ retval = as5011_i2c_write(plat_dat->i2c_client,
@@ -307,7 +308,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
+ "Power config failed\n");
-+ goto soft_reset_error;
++ goto err_exit_gpio;
+ }
+
+ retval = as5011_i2c_write(plat_dat->i2c_client,
@@ -316,7 +317,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
+ "Can't invert spinning\n");
-+ goto invert_spinning_error;
++ goto err_exit_gpio;
+ }
+
+ /* write threshold */
@@ -326,7 +327,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
+ "Can't write threshold\n");
-+ goto threshold_error;
++ goto err_exit_gpio;
+ }
+
+ retval = as5011_i2c_write(plat_dat->i2c_client,
@@ -335,7 +336,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
+ "Can't write threshold\n");
-+ goto threshold_error;
++ goto err_exit_gpio;
+ }
+
+ retval = as5011_i2c_write(plat_dat->i2c_client,
@@ -344,7 +345,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
+ "Can't write threshold\n");
-+ goto threshold_error;
++ goto err_exit_gpio;
+ }
+
+ retval = as5011_i2c_write(plat_dat->i2c_client,
@@ -353,7 +354,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
+ "Can't write threshold\n");
-+ goto threshold_error;
++ goto err_exit_gpio;
+ }
+
+
@@ -363,33 +364,30 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ retval = input_register_device(plat_dat->input_dev);
+ if (retval) {
+ dev_err(&client->dev, "Failed to register device\n");
-+ goto input_register_device_error;
++ goto err_exit_gpio;
+ }
+
+ return 0;
+
+ /* Error management */
-+threshold_error:
-+invert_spinning_error:
-+soft_reset_error:
++err_unregister_input_dev:
++ input_unregister_device(plat_dat->input_dev);
++err_exit_gpio:
+ if (plat_dat->exit_gpio != NULL)
+ plat_dat->exit_gpio();
-+init_gpio_error:
-+ input_unregister_device(plat_dat->input_dev);
-+input_register_device_error:
++err_free_irq_int:
+ free_irq(plat_dat->int_irq, as5011_int_interrupt);
-+request_int_irq_error:
++err_free_int_irq_name:
+ kfree(plat_dat->int_irq_name);
-+input_allocate_int_device_name_error:
++err_free_irq_button_interrupt:
+ free_irq(plat_dat->button_irq, button_interrupt);
-+request_irq_error:
++err_free_button_irq_name:
+ kfree(plat_dat->button_irq_name);
-+input_allocate_device_name_error:
++err_input_free_device:
+ input_free_device(plat_dat->input_dev);
-+input_allocate_device_error:
-+i2c_protocol_error:
++err_destroy_worqueue:
+ destroy_workqueue(plat_dat->workqueue);
-+workqueue_create_error:
++err_out:
+ return retval;
+}
+static int as5011_remove(struct i2c_client *client)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-25 11:22:02
|
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 d701edd3422ebb660b610c7f58e806b9aa7f6fc8 (commit)
via c163330ba2f918a387ff36e62b2e59b2fe4997ad (commit)
via 8e98c104b00592173aca944c3628c0221be48d5a (commit)
via aead97ba57e5c6757f74df2eaf1a49c8fb0233da (commit)
from 8e60094543363ec4398dd40e8cecdee60953d9ae (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 d701edd3422ebb660b610c7f58e806b9aa7f6fc8
Merge: c163330ba2f918a387ff36e62b2e59b2fe4997ad 8e60094543363ec4398dd40e8cecdee60953d9ae
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 12:21:36 2010 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c163330ba2f918a387ff36e62b2e59b2fe4997ad
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 12:20:32 2010 +0100
Updates buildroot/package/.gitignore
commit 8e98c104b00592173aca944c3628c0221be48d5a
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 12:19:24 2010 +0100
[LINUX] 2.6.36: Port of patches 301, 314 and 315 from 2.6.29 ones
commit aead97ba57e5c6757f74df2eaf1a49c8fb0233da
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 10:42:11 2010 +0100
[BUILDROOT] [2010.11] If U-Boot config file is a symbolic link, dereference it when copying it
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 2 +-
...us-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch | 27 +++++++
.../314-armadeus-ad9889-add_driver.patch} | 78 ++++++++++---------
.../315-darius-imx_wdt-add_watchdog_driver.patch} | 41 ++++++-----
...d_possibility_to_choose_board_header_file.patch | 10 +-
5 files changed, 96 insertions(+), 62 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/301-armadeus-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29/314-apf27-armadeus-ad9889.patch => 2.6.36/314-armadeus-ad9889-add_driver.patch} (94%)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29/315-apf27-darius-mxc-watchdog.patch => 2.6.36/315-darius-imx_wdt-add_watchdog_driver.patch} (91%)
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 31747f1..0500b9e 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -6,7 +6,7 @@
/Makefile.autotools.in
/Makefile.package.in
/Makefile.in
-/buildroot-libtool.patch
+/buildroot-libtool*.patch
# except:
!/armadeus/
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/301-armadeus-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/301-armadeus-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch
new file mode 100644
index 0000000..00e661a
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/301-armadeus-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch
@@ -0,0 +1,27 @@
+TXD signal of SSI modules is an ouput not an input.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/iomux-mx2x.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2010-11-25 10:54:08.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/iomux-mx2x.h 2010-11-25 10:55:06.000000000 +0100
+@@ -78,15 +78,15 @@
+ #define PC15_PF_TIN (GPIO_PORTC | GPIO_PF | 15)
+ #define PC20_PF_SSI1_FS (GPIO_PORTC | GPIO_PF | GPIO_IN | 20)
+ #define PC21_PF_SSI1_RXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 21)
+-#define PC22_PF_SSI1_TXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 22)
++#define PC22_PF_SSI1_TXD (GPIO_PORTC | GPIO_PF | GPIO_OUT | 22)
+ #define PC23_PF_SSI1_CLK (GPIO_PORTC | GPIO_PF | GPIO_IN | 23)
+ #define PC24_PF_SSI2_FS (GPIO_PORTC | GPIO_PF | GPIO_IN | 24)
+ #define PC25_PF_SSI2_RXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 25)
+-#define PC26_PF_SSI2_TXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 26)
++#define PC26_PF_SSI2_TXD (GPIO_PORTC | GPIO_PF | GPIO_OUT | 26)
+ #define PC27_PF_SSI2_CLK (GPIO_PORTC | GPIO_PF | GPIO_IN | 27)
+ #define PC28_PF_SSI3_FS (GPIO_PORTC | GPIO_PF | GPIO_IN | 28)
+ #define PC29_PF_SSI3_RXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 29)
+-#define PC30_PF_SSI3_TXD (GPIO_PORTC | GPIO_PF | GPIO_IN | 30)
++#define PC30_PF_SSI3_TXD (GPIO_PORTC | GPIO_PF | GPIO_OUT | 30)
+ #define PC31_PF_SSI3_CLK (GPIO_PORTC | GPIO_PF | GPIO_IN | 31)
+ #define PD17_PF_I2C_DATA (GPIO_PORTD | GPIO_PF | GPIO_OUT | 17)
+ #define PD18_PF_I2C_CLK (GPIO_PORTD | GPIO_PF | GPIO_OUT | 18)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/314-armadeus-ad9889-add_driver.patch
similarity index 94%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/314-armadeus-ad9889-add_driver.patch
index 03f43f5..5bbb959 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/314-armadeus-ad9889-add_driver.patch
@@ -1,7 +1,44 @@
-Index: linux-2.6.29.6/drivers/media/video/ad9889.c
+Adds a driver for Analog Devices AD9889 digital video encoder.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.36/drivers/media/video/Makefile
+===================================================================
+--- linux-2.6.36.orig/drivers/media/video/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/media/video/Makefile 2010-11-25 11:05:40.000000000 +0100
+@@ -44,6 +44,7 @@
+ obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
+ obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
+ obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
++obj-$(CONFIG_VIDEO_AD9889) += ad9889.o
+ obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
+ obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
+ obj-$(CONFIG_VIDEO_ADV7180) += adv7180.o
+Index: linux-2.6.36/drivers/media/video/Kconfig
+===================================================================
+--- linux-2.6.36.orig/drivers/media/video/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/media/video/Kconfig 2010-11-25 11:05:40.000000000 +0100
+@@ -448,6 +448,16 @@
+ To compile this driver as a module, choose M here: the
+ module will be called saa7185.
+
++config VIDEO_AD9889
++ tristate "Analog Devices AD9889 digital video encoders"
++ depends on VIDEO_V4L2 && I2C
++ ---help---
++ Support for the Analog Devices AD9889 digital video encoders.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ad9889.
++
++
+ config VIDEO_ADV7170
+ tristate "Analog Devices ADV7170 video encoder"
+ depends on VIDEO_V4L2 && I2C
+Index: linux-2.6.36/drivers/media/video/ad9889.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/media/video/ad9889.c 2009-11-23 16:00:24.000000000 +0100
++++ linux-2.6.36/drivers/media/video/ad9889.c 2010-11-25 11:05:40.000000000 +0100
@@ -0,0 +1,513 @@
+/*
+ * ad9889 - Analog Devices AD9889 video encoder driver
@@ -516,10 +553,10 @@ Index: linux-2.6.29.6/drivers/media/video/ad9889.c
+ .remove = ad9889_remove,
+ .id_table = ad9889_id,
+};
-Index: linux-2.6.29.6/include/media/ad9889.h
+Index: linux-2.6.36/include/media/ad9889.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/media/ad9889.h 2009-11-23 15:55:20.000000000 +0100
++++ linux-2.6.36/include/media/ad9889.h 2010-11-25 11:05:40.000000000 +0100
@@ -0,0 +1,34 @@
+/*
+ * AD9889 driver
@@ -555,36 +592,3 @@ Index: linux-2.6.29.6/include/media/ad9889.h
+
+
+#endif /* __LINUX_VIDE0_AD9889_H */
-Index: linux-2.6.29.6/drivers/media/video/Makefile
-===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Makefile 2009-11-23 15:54:46.000000000 +0100
-+++ linux-2.6.29.6/drivers/media/video/Makefile 2009-11-23 16:00:36.000000000 +0100
-@@ -50,6 +50,7 @@
- obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
- obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
- obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
-+obj-$(CONFIG_VIDEO_AD9889) += ad9889.o
- obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
- obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
- obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
-Index: linux-2.6.29.6/drivers/media/video/Kconfig
-===================================================================
---- linux-2.6.29.6.orig/drivers/media/video/Kconfig 2009-11-23 15:54:46.000000000 +0100
-+++ linux-2.6.29.6/drivers/media/video/Kconfig 2009-11-23 16:00:36.000000000 +0100
-@@ -428,6 +428,16 @@
- To compile this driver as a module, choose M here: the
- module will be called saa7185.
-
-+config VIDEO_AD9889
-+ tristate "Analog Devices AD9889 digital video encoders"
-+ depends on VIDEO_V4L2 && I2C
-+ ---help---
-+ Support for the Analog Devices AD9889 digital video encoders.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called ad9889.
-+
-+
- config VIDEO_ADV7170
- tristate "Analog Devices ADV7170 video encoder"
- depends on VIDEO_V4L1 && I2C
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/315-apf27-darius-mxc-watchdog.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/315-darius-imx_wdt-add_watchdog_driver.patch
similarity index 91%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/315-apf27-darius-mxc-watchdog.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/315-darius-imx_wdt-add_watchdog_driver.patch
index 07e5974..11e4bf5 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/315-apf27-darius-mxc-watchdog.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/315-darius-imx_wdt-add_watchdog_driver.patch
@@ -1,20 +1,23 @@
From: Darius Augulis <aug...@gm...>
+JB:
Driver for watchdog timer on Freesale IMX processors.
+Even if it can support MX1, MX2 and MX3 this driver will only be used
+for MX1/L platforms as it has been replaced by mx2_wdt on mainline.
Signed-off-by: Darius Augulis <aug...@gm...>
-Index: linux-2.6.29/drivers/watchdog/Kconfig
+Index: linux-2.6.36/drivers/watchdog/Kconfig
===================================================================
---- linux-2.6.29.orig/drivers/watchdog/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/watchdog/Kconfig 2009-03-31 12:02:58.000000000 +0200
-@@ -66,6 +66,18 @@
+--- linux-2.6.36.orig/drivers/watchdog/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/watchdog/Kconfig 2010-11-25 11:41:19.000000000 +0100
+@@ -73,6 +73,18 @@
# ARM Architecture
+config IMX_WDT
+ tristate "IMX Watchdog"
-+ depends on ARCH_MXC
++ depends on ARCH_MX1
+ help
+ This is the driver for the hardware watchdog
+ on the Freescale IMX processors.
@@ -24,25 +27,25 @@ Index: linux-2.6.29/drivers/watchdog/Kconfig
+ To compile this driver as a module, choose M here: the
+ module will be called imx_wdt.
+
- config AT91RM9200_WATCHDOG
- tristate "AT91RM9200 watchdog"
- depends on ARCH_AT91RM9200
-Index: linux-2.6.29/drivers/watchdog/Makefile
+ config ARM_SP805_WATCHDOG
+ tristate "ARM SP805 Watchdog"
+ depends on ARM_AMBA
+Index: linux-2.6.36/drivers/watchdog/Makefile
===================================================================
---- linux-2.6.29.orig/drivers/watchdog/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/watchdog/Makefile 2009-03-31 12:03:30.000000000 +0200
-@@ -41,6 +41,7 @@
- obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o
- obj-$(CONFIG_DAVINCI_WATCHDOG) += davinci_wdt.o
- obj-$(CONFIG_ORION5X_WATCHDOG) += orion5x_wdt.o
+--- linux-2.6.36.orig/drivers/watchdog/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/drivers/watchdog/Makefile 2010-11-25 11:38:08.000000000 +0100
+@@ -49,6 +49,7 @@
+ obj-$(CONFIG_ADX_WATCHDOG) += adx_wdt.o
+ obj-$(CONFIG_TS72XX_WATCHDOG) += ts72xx_wdt.o
+ obj-$(CONFIG_IMX2_WDT) += imx2_wdt.o
+obj-$(CONFIG_IMX_WDT) += imx-wdt.o
- # ARM26 Architecture
-
-Index: linux-2.6.29/drivers/watchdog/imx-wdt.c
+ # AVR32 Architecture
+ obj-$(CONFIG_AT32AP700X_WDT) += at32ap700x_wdt.o
+Index: linux-2.6.36/drivers/watchdog/imx-wdt.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29/drivers/watchdog/imx-wdt.c 2009-03-31 12:02:58.000000000 +0200
++++ linux-2.6.36/drivers/watchdog/imx-wdt.c 2010-11-25 11:38:08.000000000 +0100
@@ -0,0 +1,432 @@
+/*
+ * Watchdog driver for IMX processors
diff --git a/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch b/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
index 9a0e8a5..076c98b 100644
--- a/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
+++ b/patches/buildroot/2010.11/051d-u-boot-add_possibility_to_choose_board_header_file.patch
@@ -7,8 +7,8 @@ So this patch reverts the removing + refines it.
Index: buildroot/boot/u-boot/Config.in
===================================================================
---- buildroot.orig/boot/u-boot/Config.in 2010-10-20 11:59:43.000000000 +0200
-+++ buildroot/boot/u-boot/Config.in 2010-10-20 12:03:30.000000000 +0200
+--- buildroot.orig/boot/u-boot/Config.in 2010-11-25 10:14:04.000000000 +0100
++++ buildroot/boot/u-boot/Config.in 2010-11-25 10:15:53.000000000 +0100
@@ -11,6 +11,14 @@
One of U-Boot supported boards to be built.
This will be suffixed with _config to meet U-Boot standard naming.
@@ -26,8 +26,8 @@ Index: buildroot/boot/u-boot/Config.in
default BR2_TARGET_UBOOT_2010_06
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk 2010-10-20 11:59:43.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk 2010-10-20 12:09:50.000000000 +0200
+--- buildroot.orig/boot/u-boot/u-boot.mk 2010-11-25 10:14:04.000000000 +0100
++++ buildroot/boot/u-boot/u-boot.mk 2010-11-25 10:17:02.000000000 +0100
@@ -45,7 +45,11 @@
U_BOOT_ARCH=$(KERNEL_ARCH:powerpc=ppc)
endif
@@ -47,7 +47,7 @@ Index: buildroot/boot/u-boot/u-boot.mk
-$(U_BOOT_DIR)/.configured: $(U_BOOT_DIR)/.patched
+$(U_BOOT_DIR)/.config_header_copied: $(U_BOOT_DIR)/.patched
+ifneq ($(strip $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE)),)
-+ cp -dpf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_INC_CONF_FILE)
++ cp -pf $(BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE) $(U_BOOT_INC_CONF_FILE)
+endif
+ touch $@
+
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-11-25 10:40:22
|
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 8e60094543363ec4398dd40e8cecdee60953d9ae (commit)
via d5d18ebfb22661d9cda8460dea38d75824d44b29 (commit)
from 4995f53902718af97cbaf0f32b9d5727536584c9 (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 8e60094543363ec4398dd40e8cecdee60953d9ae
Merge: d5d18ebfb22661d9cda8460dea38d75824d44b29 4995f53902718af97cbaf0f32b9d5727536584c9
Author: Fabien Marteau <fab...@ar...>
Date: Thu Nov 25 11:39:55 2010 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit d5d18ebfb22661d9cda8460dea38d75824d44b29
Author: Fabien Marteau <fab...@ar...>
Date: Thu Nov 25 11:39:23 2010 +0100
[linux] Correcting as5011 driver according to kernel developper advices.
-----------------------------------------------------------------------
Summary of changes:
...us-joystick-adding_as5011_joystick_driver.patch | 127 ++++++++------------
1 files changed, 51 insertions(+), 76 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
index 27fcd3b..d587b63 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
@@ -5,8 +5,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-11-23 17:47:47.000000000 +0100
-@@ -0,0 +1,454 @@
++++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-11-25 11:06:56.000000000 +0100
+@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2010 Fabien Marteau <fab...@ar...>
+ *
@@ -65,6 +65,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+MODULE_LICENSE("GPL");
+
+#define SIZE_NAME 30
++#define SIZE_EVENT_PATH 40
+#define AS5011_MAX_AXIS 80
+#define AS5011_MIN_AXIS (-80)
+#define AS5011_FUZZ 8
@@ -139,7 +140,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+
+ ret = i2c_transfer(client->adapter, &msg, 1);
+ if (ret < 0)
-+ return -EINVAL;
++ return ret;
+ return 1;
+}
+
@@ -164,7 +165,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+
+ ret = i2c_transfer(client->adapter, msg_set, 2);
+ if (ret < 0)
-+ return -EINVAL;
++ return ret;
+
+ if (data[0] & 0x80)
+ return -1*(1+(~data[0]));
@@ -172,7 +173,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ return data[0];
+}
+
-+static int as5011_probe(struct i2c_client *client,
++static int __devinit as5011_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ struct as5011_platform_data *plat_dat = client->dev.platform_data;
@@ -181,18 +182,13 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ plat_dat->num = g_num;
+ g_num++;
+
-+ retval = snprintf(plat_dat->workqueue_name,
++ scnprintf(plat_dat->workqueue_name,
+ SIZE_NAME,
+ "as5011_%d_workqueue", plat_dat->num);
-+ if (retval < 0) {
-+ dev_err(&client->dev, "as5011: Failed to give workqueue name\n");
-+ retval = -1;
-+ goto workqueue_name_error;
-+ }
+ plat_dat->workqueue =
+ create_singlethread_workqueue(plat_dat->workqueue_name);
+ if (plat_dat->workqueue == NULL) {
-+ dev_err(&client->dev, "as5011: Failed to create workqueue\n");
++ dev_err(&client->dev, "Failed to create workqueue\n");
+ retval = -EINVAL;
+ goto workqueue_create_error;
+ }
@@ -209,7 +205,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ plat_dat->i2c_client = client;
+
+ plat_dat->input_dev = input_allocate_device();
-+ if (plat_dat->input_dev < 0) {
++ if (plat_dat->input_dev == NULL) {
+ dev_err(&client->dev,
+ "not enough memory for input devices structure\n");
+ retval = -ENOMEM;
@@ -219,7 +215,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ plat_dat->input_dev->name = "Austria Microsystem as5011 joystick";
+ plat_dat->input_dev->uniq = "Austria0";
+ plat_dat->input_dev->id.bustype = BUS_I2C;
-+ plat_dat->input_dev->phys = "/dev/input/event0";
++ plat_dat->input_dev->phys = NULL;
+ plat_dat->input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+ plat_dat->input_dev->keybit[BIT_WORD(BTN_JOYSTICK)] =
+ BIT_MASK(BTN_JOYSTICK);
@@ -237,9 +233,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ AS5011_FUZZ,
+ AS5011_FLAT);
+
-+ plat_dat->button_irq_name =
-+ kmalloc(sizeof(unsigned char)*SIZE_NAME,
-+ GFP_KERNEL);
++ plat_dat->button_irq_name = kmalloc(SIZE_NAME, GFP_KERNEL);
+ if (plat_dat->button_irq_name == NULL) {
+ dev_err(&client->dev,
+ "not enough memory for input devices irq name\n");
@@ -247,28 +241,24 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ goto input_allocate_device_name_error;
+ }
+
++ scnprintf(plat_dat->button_irq_name,
++ SIZE_NAME,
++ "as5011_%d_button",
++ plat_dat->num);
+
-+ retval = snprintf(plat_dat->button_irq_name,
-+ SIZE_NAME,
-+ "as5011_%d_button",
-+ plat_dat->num);
++ retval = request_irq( plat_dat->button_irq,
++ button_interrupt,
++ 0,
++ plat_dat->button_irq_name,
++ (void *)plat_dat);
+ if (retval < 0) {
-+ dev_err(&client->dev, "as5011: Failed to give button irq name\n");
-+ retval = -EINVAL;
-+ goto button_irq_name_error;
-+ }
-+
-+ if (request_irq(plat_dat->button_irq, button_interrupt,
-+ 0, plat_dat->button_irq_name, (void *)plat_dat)) {
-+ dev_err(&client->dev, "as5011: Can't allocate irq %d\n",
++ dev_err(&client->dev, "Can't allocate irq %d\n",
+ plat_dat->button_irq);
+ retval = -EBUSY;
+ goto request_irq_error;
+ }
+
-+ plat_dat->int_irq_name =
-+ kmalloc(sizeof(unsigned char)*SIZE_NAME,
-+ GFP_KERNEL);
++ plat_dat->int_irq_name = kmalloc(SIZE_NAME, GFP_KERNEL);
+ if (plat_dat->int_irq_name == NULL) {
+ dev_err(&client->dev,
+ "not enough memory for input devices int irq name\n");
@@ -276,37 +266,26 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ goto input_allocate_int_device_name_error;
+ }
+
-+ retval = snprintf(plat_dat->int_irq_name,
-+ SIZE_NAME,
-+ "as5011_%d_int",
-+ plat_dat->num);
-+ if (retval < 0) {
-+ dev_err(&client->dev, "as5011: Failed to give int irq name\n");
-+ retval = -EINVAL;
-+ goto int_irq_name_error;
-+ }
-+
++ scnprintf(plat_dat->int_irq_name,
++ SIZE_NAME,
++ "as5011_%d_int",
++ plat_dat->num);
+
+ if (request_irq(plat_dat->int_irq, as5011_int_interrupt,
+ 0, plat_dat->int_irq_name, (void *)plat_dat)) {
-+ dev_err(&client->dev, "as5011: Can't allocate int irq %d\n",
++ dev_err(&client->dev, "Can't allocate int irq %d\n",
+ plat_dat->int_irq);
+ retval = -EBUSY;
+ goto request_int_irq_error;
+ }
+
-+ retval = input_register_device(plat_dat->input_dev);
-+ if (retval) {
-+ dev_err(&client->dev, "as5011: Failed to register device\n");
-+ retval = -EINVAL;
-+ goto input_register_device_error;
-+ }
+
-+ retval = plat_dat->init_gpio();
-+ if (retval < 0) {
-+ dev_err(&client->dev, "as5011: Failed to init gpios\n");
-+ retval = -EINVAL;
-+ goto init_gpio_error;
++ if (plat_dat->init_gpio != NULL) {
++ retval = plat_dat->init_gpio();
++ if (retval < 0) {
++ dev_err(&client->dev, "Failed to init gpios\n");
++ goto init_gpio_error;
++ }
+ }
+
+ /* chip soft reset */
@@ -315,8 +294,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ AS5011_CTRL1_SOFT_RST);
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
-+ "as5011: soft reset failed\n");
-+ retval = -EINVAL;
++ "Soft reset failed\n");
+ goto soft_reset_error;
+ }
+
@@ -328,8 +306,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ );
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
-+ "as5011: power config failed\n");
-+ retval = -EINVAL;
++ "Power config failed\n");
+ goto soft_reset_error;
+ }
+
@@ -338,8 +315,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ AS5011_CTRL2_INV_SPINNING);
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
-+ "as5011: can't invert spinning\n");
-+ retval = -EINVAL;
++ "Can't invert spinning\n");
+ goto invert_spinning_error;
+ }
+
@@ -349,8 +325,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ plat_dat->Xp);
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
-+ "as5011: can't write threshold\n");
-+ retval = -EINVAL;
++ "Can't write threshold\n");
+ goto threshold_error;
+ }
+
@@ -359,8 +334,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ plat_dat->Xn);
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
-+ "as5011: can't write threshold\n");
-+ retval = -EINVAL;
++ "Can't write threshold\n");
+ goto threshold_error;
+ }
+
@@ -369,8 +343,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ plat_dat->Yp);
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
-+ "as5011: can't write threshold\n");
-+ retval = -EINVAL;
++ "Can't write threshold\n");
+ goto threshold_error;
+ }
+
@@ -379,15 +352,19 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ plat_dat->Yn);
+ if (retval < 0) {
+ dev_err(&plat_dat->i2c_client->dev,
-+ "as5011: can't write threshold\n");
-+ retval = -EINVAL;
++ "Can't write threshold\n");
+ goto threshold_error;
+ }
+
++
+ /* to free irq gpio in chip*/
+ as5011_i2c_read(plat_dat->i2c_client, AS5011_X_RES_INT);
+
-+ queue_work(plat_dat->workqueue, &plat_dat->update_axes_work);
++ retval = input_register_device(plat_dat->input_dev);
++ if (retval) {
++ dev_err(&client->dev, "Failed to register device\n");
++ goto input_register_device_error;
++ }
+
+ return 0;
+
@@ -395,18 +372,17 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+threshold_error:
+invert_spinning_error:
+soft_reset_error:
-+ plat_dat->exit_gpio();
++ if (plat_dat->exit_gpio != NULL)
++ plat_dat->exit_gpio();
+init_gpio_error:
+ input_unregister_device(plat_dat->input_dev);
+input_register_device_error:
+ free_irq(plat_dat->int_irq, as5011_int_interrupt);
+request_int_irq_error:
-+int_irq_name_error:
+ kfree(plat_dat->int_irq_name);
+input_allocate_int_device_name_error:
+ free_irq(plat_dat->button_irq, button_interrupt);
+request_irq_error:
-+button_irq_name_error:
+ kfree(plat_dat->button_irq_name);
+input_allocate_device_name_error:
+ input_free_device(plat_dat->input_dev);
@@ -414,7 +390,6 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+i2c_protocol_error:
+ destroy_workqueue(plat_dat->workqueue);
+workqueue_create_error:
-+workqueue_name_error:
+ return retval;
+}
+static int as5011_remove(struct i2c_client *client)
@@ -426,8 +401,8 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ free_irq(plat_dat->button_irq, plat_dat);
+ free_irq(plat_dat->int_irq, plat_dat);
+ kfree(plat_dat->button_irq_name);
-+ input_free_device(plat_dat->input_dev);
-+ plat_dat->exit_gpio();
++ if (plat_dat->exit_gpio != NULL)
++ plat_dat->exit_gpio();
+
+ return 0;
+}
@@ -441,7 +416,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ .name = "as5011",
+ },
+ .probe = as5011_probe,
-+ .remove = as5011_remove,
++ .remove = __devexit_p(as5011_remove),
+ .id_table = as5011_id,
+};
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-25 07:44:20
|
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 4995f53902718af97cbaf0f32b9d5727536584c9 (commit)
from e9359933afc329838e492b175617fe58954edeeb (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 4995f53902718af97cbaf0f32b9d5727536584c9
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 25 08:43:30 2010 +0100
[BUILDROOT] Removes warning in buildroot/package/armadeus/pps/Config.in
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/pps/Config.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildroot/package/armadeus/pps/Config.in b/buildroot/package/armadeus/pps/Config.in
index 383785c..e035279 100644
--- a/buildroot/package/armadeus/pps/Config.in
+++ b/buildroot/package/armadeus/pps/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS
bool "PPS Test scripts"
default n
help
- Install PPS Test scripts to test ethernet, wifi & USB Gadget on PPS board.
- Test scripts will be installed on the APF in /usr/local/pps/scripts.
+ Install PPS Test scripts to test Ethernet, WiFi & USB Gadget on
+ PPS board. Test scripts will be installed in /usr/local/pps/scripts.
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-24 18:26: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 e9359933afc329838e492b175617fe58954edeeb (commit)
from a7182e83b93bced66c5de0485294d52cf802a1af (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 e9359933afc329838e492b175617fe58954edeeb
Author: Julien Boibessot <jul...@ar...>
Date: Wed Nov 24 19:23:03 2010 +0100
[LINUX] PPS: add missing patches to have a compiling kernel
-----------------------------------------------------------------------
Summary of changes:
...355e-armadeus-fsl_udc-reset_temporary_fix.patch | 39 ++++++++++++++++++++
...dd_usb3315_registers_definition_in_ulpi_h.patch | 28 ++++++++++++++
2 files changed, 67 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/355e-armadeus-fsl_udc-reset_temporary_fix.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/364-armadeus-add_usb3315_registers_definition_in_ulpi_h.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/355e-armadeus-fsl_udc-reset_temporary_fix.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/355e-armadeus-fsl_udc-reset_temporary_fix.patch
new file mode 100644
index 0000000..6153c2f
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/355e-armadeus-fsl_udc-reset_temporary_fix.patch
@@ -0,0 +1,39 @@
+!! Temporary fix !!
+
+Make USB device working on APF27.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.29.6/drivers/usb/gadget/fsl_udc_core.c
+===================================================================
+--- linux-2.6.29.6.orig/drivers/usb/gadget/fsl_udc_core.c 2010-04-22 14:49:58.000000000 +0200
++++ linux-2.6.29.6/drivers/usb/gadget/fsl_udc_core.c 2010-04-22 14:53:56.000000000 +0200
+@@ -1627,6 +1627,7 @@ static void reset_irq(struct fsl_udc *ud
+ {
+ u32 temp;
+ unsigned long timeout;
++ static int first = 1;
+
+ /* Clear the device address */
+ temp = fsl_readl(&dr_regs->deviceaddr);
+@@ -1664,7 +1665,19 @@ static void reset_irq(struct fsl_udc *ud
+ /* Write 1s to the flush register */
+ fsl_writel(0xffffffff, &dr_regs->endptflush);
+
+- if (fsl_readl(&dr_regs->portsc1) & PORTSCX_PORT_RESET) {
++ if (first) {
++ dr_controller_setup(udc);
++
++ /* Reset all internal used Queues */
++ reset_queues(udc);
++
++ ep0_setup(udc);
++
++ /* Enable DR IRQ reg, Set Run bit, change udc state */
++ dr_controller_run(udc);
++ udc->usb_state = USB_STATE_ATTACHED;
++ first = 0;
++ } else if (fsl_readl(&dr_regs->portsc1) & PORTSCX_PORT_RESET) {
+ VDBG("Bus reset");
+ /* Reset all the queues, include XD, dTD, EP queue
+ * head and TR Queue */
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/364-armadeus-add_usb3315_registers_definition_in_ulpi_h.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/364-armadeus-add_usb3315_registers_definition_in_ulpi_h.patch
new file mode 100644
index 0000000..4ddbb9d
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/364-armadeus-add_usb3315_registers_definition_in_ulpi_h.patch
@@ -0,0 +1,28 @@
+Add USB3315 registers definition to arch/arm/plat-mxc/include/mach/ulpi.h
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.29.6/arch/arm/plat-mxc/include/mach/ulpi.h
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/plat-mxc/include/mach/ulpi.h 2010-02-23 16:29:43.000000000 +0100
++++ linux-2.6.29.6/arch/arm/plat-mxc/include/mach/ulpi.h 2010-02-23 16:30:49.000000000 +0100
+@@ -18,6 +18,19 @@
+ #define ISP1504_REG_SET 0x01
+ #define ISP1504_REG_CLEAR 0x02
+
++/* USB3315 register addresses */
++#define USB3315_VID_LOW 0x00 /* Vendor ID low */
++#define USB3315_VID_HIGH 0x01 /* Vendor ID high */
++#define USB3315_PID_LOW 0x02 /* Product ID low */
++#define USB3315_PID_HIGH 0x03 /* Product ID high */
++#define USB3315_FCNCTL 0x04 /* Function Control */
++#define USB3315_ITFCTL 0x07 /* Interface Control */
++#define USB3315_OTGCTL 0x0A /* OTG Control */
++
++/* Add to above register address to access Set/Clear functions */
++#define USB3315_REG_SET 0x01
++#define USB3315_REG_CLEAR 0x02
++
+ /* 1504 Function Control Register bits */
+ #define SUSPENDM (1 << 6) /* Suspend LOW */
+ #define RESET (1 << 5) /* Reset */
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-24 15:00:00
|
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 a7182e83b93bced66c5de0485294d52cf802a1af (commit)
via 3636aa6bfbdca0216dd45526d19ce1a66522ffae (commit)
via 8384c4dc7a5eedfadcabcf92764e592c359a221a (commit)
via 542a8a5e56e9ee80ad97310e3ee279b0588004c1 (commit)
from c88a59af4954791020cf113d713dbb5fbb3455aa (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 a7182e83b93bced66c5de0485294d52cf802a1af
Author: Julien Boibessot <jul...@ar...>
Date: Wed Nov 24 15:52:43 2010 +0100
[U-BOOT] envt variables: use apfxx-rootfs-arm.ubi instead of apfxx-rootfs-arm.ubifs as rootfs image
commit 3636aa6bfbdca0216dd45526d19ce1a66522ffae
Author: Julien Boibessot <jul...@ar...>
Date: Wed Nov 24 15:18:55 2010 +0100
[BUILDROOT] removes executable rights on apf27-u-boot-2010.03.h
commit 8384c4dc7a5eedfadcabcf92764e592c359a221a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Nov 24 15:16:19 2010 +0100
[BUILDROOT] target/device/armadeus/: re-create apf27-u-boot-1.3.4.h; now it is a link to apf27.h
commit 542a8a5e56e9ee80ad97310e3ee279b0588004c1
Author: Julien Boibessot <jul...@ar...>
Date: Wed Nov 24 15:14:35 2010 +0100
[BUILDROOT] target/device/armadeus/: apf27-u-boot-1.3.4.h is the same file as apf27.h so remove it (apf27-u-boot-1.3.4.h).
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-1.3.4.h | 914 +-------------------
.../device/armadeus/apf27/apf27-u-boot-2010.03.h | 6 +-
buildroot/target/device/armadeus/apf27/apf27.h | 4 +-
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 6 +-
4 files changed, 9 insertions(+), 921 deletions(-)
mode change 100644 => 120000 buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
mode change 100755 => 100644 buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
deleted file mode 100644
index 7126904..0000000
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
+++ /dev/null
@@ -1,913 +0,0 @@
-/*
- *
- * Configuration settings for the Armadeus Project apf27 board.
- *
- * Copyright (c) 2008-2009 Eric Jarrige <eri...@ar...>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- *
- * 2008/08/19 Initial version based on apf9328 configuration file
- * 2008/10/09 Release 1.0 support u-boot 1.3.4
- * 2008/10/25 Release 1.1 added environment version
- * 2008/11/01 Release 1.2 flash size independant
- * 2008/11/09 Release 1.3 keep uboot partition locked & source clean-up
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#define CONFIG_ENV_VERSION "1.7"
-#define CONFIG_IDENT_STRING " apf27 patch 2.1"
-
-#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
-#define CONFIG_IMX27 1 /* in a Freescale i.MX27 Chip */
-#define CONFIG_APF27 1 /* on a Armadeus project APF27 board */
-#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
-
-/*
- * Enable the call to misc_init_r() for miscellaneous platform
- * dependent initialization.
- */
-
-#define CONFIG_MISC_INIT_R
-
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_BOOTP_BOOTPATH
-#define CONFIG_BOOTP_GATEWAY
-#define CONFIG_BOOTP_HOSTNAME
-
-/*
- * Select serial console configuration
- */
-#define CONFIG_IMX_SERIAL1
-#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
-#define CONFIG_BAUDRATE 115200
-
-/*
- * Definition of u-boot build in commands. Check out CONFIG_CMD_DFL if
- * neccessary in include/cmd_confdefs.h file. (Un)comment for getting
- * functionality or size of u-boot code.
- */
-
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ASKENV /* ask for env variable */
-#define CONFIG_CMD_BSP /* Board Specific functions */
-#define CONFIG_CMD_CACHE /* icache, dcache */
-#define CONFIG_CMD_CDP /* Cisco Discovery Protocol */
-#define CONFIG_CMD_DATE /* support for RTC, date/time...*/
-#define CONFIG_CMD_DHCP /* DHCP Support */
-#define CONFIG_CMD_DIAG /* Diagnostics */
-#define CONFIG_CMD_EEPROM /* EEPROM read/write support */
-#define CONFIG_CMD_FAT /* FAT support */
-#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
-#define CONFIG_CMD_I2C /* I2C serial bus support */
-#undef CONFIG_CMD_IMLS /* List all found images */
-#define CONFIG_CMD_IMMAP /* IMMR dump support */
-#define CONFIG_CMD_JFFS2 /* JFFS2 Support */
-#define CONFIG_CMD_MII /* MII support */
-#define CONFIG_CMD_NAND /* NAND support */
-#define CONFIG_CMD_PING /* ping support */
-#undef CONFIG_CMD_PORTIO /* Port I/O */
-#undef CONFIG_CMD_REGINFO /* Register dump */
-#define CONFIG_CMD_SAVES /* save S record dump */
-#define CONFIG_CMD_SETEXPR /* setexpr support */
-#define CONFIG_CMD_SNTP /* SNTP support */
-#define CONFIG_CMD_IMX_FUSE /* iMX fuse access commands */
-
-#undef CONFIG_DISPLAY_BOARDINFO
-#undef CONFIG_DISPLAY_CPUINFO
-
-/*
- * Select some advanced features of the commande line parser
- */
-#define CONFIG_AUTO_COMPLETE 1 /* Enable auto completion of */
- /* commands using TAB */
-#define CFG_HUSH_PARSER 1 /* enable the "hush" shell */
-#define CFG_PROMPT_HUSH_PS2 "> " /* secondary prompt string */
-#define CONFIG_CMDLINE_EDITING 1
-
-/*
- * Boot options. Setting delay to -1 stops autostart count down.
- */
-#define CONFIG_BOOTDELAY 20
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
-#define CONFIG_BOOTARGS \
- CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
-
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)
-#define CONFIG_MTDMAP "mxc_nand.0"
-#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
-#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":640k(U-boot)ro," \
- "384k(U-boot_env),512k(firmware)," \
- "5M(kernel)," \
- "-(rootfs)"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
- "env_version=" CONFIG_ENV_VERSION "\0" \
- "fileaddr=" MK_STR(CFG_LOAD_ADDR) "\0" \
- "filesize=" MK_STR(CFG_MONITOR_LEN) "\0" \
- "console=" CONFIG_CONSOLE "\0" \
- "mtdparts=" MTDPARTS_DEFAULT "\0" \
- "partition=nand0,4\0" \
- "uboot_offset=" MK_STR(CFG_MONITOR_OFFSET) "\0" \
- "uboot_len=" MK_STR(CFG_MONITOR_LEN) "\0" \
- "env_offset=" MK_STR(CFG_ENV_OFFSET) "\0" \
- "env_len=" MK_STR(CFG_ENV_SIZE) "\0" \
- "firmware_offset=" MK_STR(CONFIG_FIRMWARE_OFFSET) "\0" \
- "firmware_len=" MK_STR(CONFIG_FIRMWARE_LEN) "\0" \
- "kernel_offset=" MK_STR(CONFIG_KERNEL_OFFSET) "\0" \
- "kernel_len=" MK_STR(CONFIG_KERNEL_LEN) "\0" \
- "rootfs_offset=" MK_STR(CONFIG_ROOTFS_OFFSET) "\0" \
- "rootfs_len=" MK_STR(CONFIG_ROOTFS_LEN) "\0" \
- "board_name=" MK_STR(CONFIG_BOARD_NAME) "\0" \
- "serverpath=" MK_STR(CONFIG_SRV_PATH) "\0" \
- "ntpserverip=217.147.208.1\0" \
- "mmcroot=/dev/mmcblk0p1\0" \
- "mmcrootfstype=ext2\0" \
- "quiet=1\0" \
- "addnfsargs=setenv bootargs ${bootargs} " \
- "root=/dev/nfs rw nfsroot=${serverip}:${rootpath}\0" \
- "addjffsargs=setenv bootargs ${bootargs} " \
- "root=/dev/mtdblock4 rootfstype=jffs2\0" \
- "addubifsargs=setenv bootargs ${bootargs} " \
- "ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs\0" \
- "addmmcargs=setenv bootargs ${bootargs} " \
- "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
- "addipargs=setenv bootargs ${bootargs} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off \0"\
- "nfsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addnfsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
- "jffsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addjffsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
- "ubifsboot=setenv bootargs ${console} ${mtdparts};" \
- "run addubifsargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
- "mmcboot=setenv bootargs ${console} ${mtdparts};" \
- "run addmmcargs addipargs; setenv autostart yes;" \
- "nboot.jffs2 A0000000 0 ${kernel_offset}\0" \
- "firmware_autoload=0\0" \
- "flash_uboot=nand unlock ${uboot_offset} ${uboot_len};" \
- "nand erase ${uboot_offset} ${uboot_len};" \
- "if nand write.jffs2 ${fileaddr} ${uboot_offset} ${filesize};" \
- "then nand lock; nand unlock ${env_offset};" \
- "echo Flashing of uboot succeed;" \
- "else echo Flashing of uboot failed;" \
- "fi; \0" \
- "flash_firmware=nand erase ${firmware_offset} ${firmware_len};"\
- "if nand write.jffs2 ${fileaddr} ${firmware_offset} ${filesize} ;"\
- "then echo Flashing of Firmware succeed;" \
- "else echo Flashing of Firmware failed;" \
- "fi\0" \
- "fpga_config=tftpboot ${fileaddr} $firmware_name;"\
- "run flash_firmware;"\
- "fpga load 0 ${fileaddr} ${firmware_len};\0"\
- "flash_kernel=nand erase ${kernel_offset} ${kernel_len};" \
- "if nand write.jffs2 ${fileaddr} ${kernel_offset} ${filesize} ;"\
- "then echo Flashing of kernel succeed;" \
- "else echo Flashing of kernel failed;" \
- "fi\0" \
- "flash_rootfs=nand erase clean ${rootfs_offset} ${rootfs_len};" \
- "if nand write.jffs2 ${fileaddr} ${rootfs_offset} ${filesize};"\
- "then echo Flashing of rootfs succeed;" \
- "else echo Flashing of rootfs failed;" \
- "fi\0" \
- "flash_reset_env=nand unlock ${env_offset} ${env_len};" \
- "nand erase ${env_offset} ${env_len};" \
- "echo Flash environment variables erased!\0" \
- "download_uboot=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-u-boot.bin\0" \
- "download_kernel=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-linux.bin\0" \
- "download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.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" \
- "unlock_regs=mw 10000008 0; mw 10020008 0\0" \
-
-#define CONFIG_BOOTCOMMAND "run jffsboot"
-#define CFG_AUTOLOAD "no"
-
-#define CONFIG_MACH_TYPE MACH_TYPE_APF27
-#define CONFIG_BOOT_PARAMS_ADDR 0xa0000100
-
-#undef CONFIG_SHOW_BOOT_PROGRESS
-
-#define CONFIG_ETHADDR
-#define CONFIG_NETMASK 255.255.255.0
-#define CONFIG_IPADDR 192.168.0.10
-#define CONFIG_BOARD_NAME "apf27"
-#define CONFIG_HOSTNAME "apf27"
-#define CONFIG_GATEWAYIP 192.168.0.1
-#define CONFIG_SERVERIP 192.168.0.2
-#define CONFIG_SRV_PATH ""
-#define CONFIG_ROOTPATH "/tftpboot/apf27-root"
-
-/*
- * General options for u-boot. Modify to save memory foot print
- */
-
-#define CFG_LONGHELP
-#define CFG_PROMPT "BIOS> " /* prompt string */
-#define CFG_CBSIZE 2048 /* console I/O buffer */
-#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* print buffer size */
-#define CFG_MAXARGS 16 /* max command args */
-#define CFG_BARGSIZE CFG_CBSIZE /* boot args buf size */
-
-#define CFG_MEMTEST_START 0xA0000000 /* memtest test area */
-#define CFG_MEMTEST_END 0xA0300000 /*64MiB -1MiB*/
-
-#define CFG_HZ 1000000 /* incrementer freq: 1 MHz */
-
-/*
- * Definitions related to passing arguments to kernel.
- */
-
-#define CONFIG_CMDLINE_TAG 1 /* send commandline to Kernel */
-#define CONFIG_SETUP_MEMORY_TAGS 1 /* send memory definition to kernel */
-#define CONFIG_INITRD_TAG 1 /* send initrd params */
-#undef CONFIG_VFD /* do not send framebuffer setup */
-
-/*
- * Malloc pool need to host env + 128 Kb reserve for other allocations.
- */
-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + (256<<10) )
-
-#define CFG_GBL_DATA_SIZE 256 /* size in bytes reserved for initial data */
-
-#define CONFIG_STACKSIZE (256<<10) /* stack size */
-
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ (4<<10) /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ (4<<10) /* FIQ stack */
-#endif
-
-/*
-* Clocks configuration
-*/
-/*
- * PLL configuration
- *
- * 31 | x |x| x x x x |x x x x x x x x x x |x x|x x x x|x x x x x x x x x x| 0
- * |CPLM|X|----PD---|--------MFD---------|XXX|--MFI--|-----MFN-----------|
- */
-
-#define CFG_OSC32 32768 /* 32768 or 32000 Hz crystal */
-#undef CFG_OSC26 /* there is no external 26MHz external clock */
-
-/* MPU CLOCK source before PLL */
-/* CONFIG_SYS_CLK_FREQ (2/3 MPLL clock or ext 266 MHZ) */
-#ifndef CFG_OSC26
-#if (CFG_OSC32 == 32000)
-#define CFG_MPCTL0_VAL 0x00211803 /* 398.998 MHz */
-#define CFG_MPCTL1_VAL 0
-#define CONFIG_MPLL_FREQ 399
-#else /* CFG_OSC32 == 32768*/
-#define CFG_MPCTL0_VAL 0x01EF15D5 /* 399.000 MHz */
-#define CFG_MPCTL1_VAL 0
-#define CONFIG_MPLL_FREQ 399
-#endif /* CFG_OSC32 */
-#else /* CFG_OSC26 in use*/
-#define CFG_MPCTL0_VAL 0x00331C23 /* 399.000 MHz */
-#define CFG_MPCTL1_VAL 0
-#define CONFIG_MPLL_FREQ 399
-#endif /* CFG_OSC26 */
-
-#define CONFIG_SYS_CLK_FREQ (CONFIG_MPLL_FREQ*2/3) /* 266 MHz */
-
-/* Serial clock source before PLL (should be named CFG_SYSPLL_CLK_FREQ) */
-#ifndef CFG_OSC26
-/*#define CONFIG_SYSPLL_CLK_FREQ (1024*CFG_OSC32)*/
-#if (CFG_OSC32 == 32000)
-#define CFG_SPCTL0_VAL 0x04A02419 /* 300.00020 MHz */
-#define CFG_SPCTL1_VAL 0
-#define CONFIG_SPLL_FREQ 300 /* MHz */
-#else /* CFG_OSC32 == 32768*/
-#define CFG_SPCTL0_VAL 0x0475206F /* 299.99937 MHz */
-#define CFG_SPCTL1_VAL 0
-#define CONFIG_SPLL_FREQ 300 /* MHz */
-#endif /* CFG_OSC32 */
-#else /* CFG_OSC26 in use*/
-/*#define CONFIG_SYSPLL_CLK_FREQ CFG_OSC26*/
-#define CFG_SPCTL0_VAL 0x040C2C07 /* 300 MHz */
-#define CFG_SPCTL1_VAL 0x0
-#define CONFIG_SPLL_FREQ 300 /* MHz */
-#endif /* CFG_OSC26 */
-
-/* ARM bus frequency (have to be a CONFIG_MPLL_FREQ ratio) */
-#define CONFIG_ARM_FREQ 399 /* up to 400 MHz */
-
-/* external bus frequency (have to be a CONFIG_SYS_CLK_FREQ ratio) */
-#define CONFIG_HCLK_FREQ 133 /* (CONFIG_SYS_CLK_FREQ/2) */
-
-#define CONFIG_PERIF1_FREQ 16 /* 16.625 MHz UART, GPT, PWM*/
-#define CONFIG_PERIF2_FREQ 33 /* 33.25 MHz CSPI and SDHC*/
-#define CONFIG_PERIF3_FREQ 33 /* 33.25 MHz LCD*/
-#define CONFIG_PERIF4_FREQ 33 /* 33.25 MHz CSI*/
-#define CONFIG_SSI1_FREQ 66 /* 66.50 MHz SSI1*/
-#define CONFIG_SSI2_FREQ 66 /* 66.50 MHz SSI2*/
-#define CONFIG_MSHC_FREQ 66 /* 66.50 MHz MSHC*/
-#define CONFIG_H264_FREQ 66 /* 66.50 MHz H264*/
-#define CONFIG_CLK0_DIV 3 /* Divide CLK0 by 4 */
-#define CONFIG_CLK0_EN 1 /* CLK0 enabled */
-
-/* external bus frequency (have to be a CONFIG_HCLK_FREQ ratio) */
-#define CONFIG_NFC_FREQ 44 /* NFC Clock up to 44 MHz wh 133MHz*/
-
-/* external serial bus frequency (have to be a CONFIG_SPLL_FREQ ratio) */
-#define CONFIG_USB_FREQ 60 /* 60 MHz */
-
-/*
- * SDRAM definition parameter
- */
-#define CONFIG_NR_DRAM_BANKS 1
-
-#define CFG_SDRAM_MBYTE_SYZE 64
-
-#if (CFG_SDRAM_MBYTE_SYZE == 8)
-/* micron 8MB */
-#define CFG_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_1_SIZE 0x00800000 /* 8 MB */
-#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_2_SIZE 0x00800000 /* 8 MB */
-#define CFG_SDRAM_NUM_COL 8 /* 8, 9, 10 or 11 column address bits */
-#define CFG_SDRAM_NUM_ROW 11 /* 11, 12 or 13 row address bits */
-#define CFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
-#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
-#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
-#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
-#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
-#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
-#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CFG_SDRAM_CLOCK_CYCLE_CL_1 20 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CFG_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CFG_SDRAM_MBYTE_SYZE == 16)
-/* micron 16MB */
-#define CFG_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_1_SIZE 0x01000000 /* 16 MB */
-#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_2_SIZE 0x01000000 /* 16 MB */
-#define CFG_SDRAM_NUM_COL 8 /* 8, 9, 10 or 11 column address bits */
-#define CFG_SDRAM_NUM_ROW 12 /* 11, 12 or 13 row address bits */
-#define CFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
-#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
-#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
-#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
-#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
-#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
-#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CFG_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CFG_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CFG_SDRAM_MBYTE_SYZE == 32)
-/* micron 32MB */
-#define CFG_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_1_SIZE 0x02000000 /* 32 MB */
-#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_2_SIZE 0x02000000 /* 32 MB */
-#define CFG_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
-#define CFG_SDRAM_NUM_ROW 12 /* 11, 12 or 13 row address bits */
-#define CFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
-#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
-#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
-#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
-#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
-#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
-#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CFG_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CFG_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CFG_SDRAM_MBYTE_SYZE == 64) /* micron MT46H16M32LF -6 */
-/* micron 64MB */
-#define CFG_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_1_SIZE 0x04000000 /* 64 MB */
-#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_2_SIZE 0x04000000 /* 64 MB */
-#define CFG_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
-#define CFG_SDRAM_NUM_ROW 13 /* 11, 12 or 13 row address bits */
-#define CFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
-#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
-#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
-#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
-#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
-#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
-#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CFG_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CFG_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CFG_SDRAM_MBYTE_SYZE == 128)
-/* micron 128MB */
-#define CFG_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_1_SIZE 0x08000000 /* 128 MB */
-#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_2_SIZE 0x08000000 /* 128 MB */
-#define CFG_SDRAM_NUM_COL 9 /* 8, 9, 10 or 11 column address bits */
-#define CFG_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
-#define CFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
-#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
-#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
-#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
-#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
-#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
-#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CFG_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CFG_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-#if (CFG_SDRAM_MBYTE_SYZE == 256)
-/* micron 256MB */
-#define CFG_SDRAM_1_BASE 0xA0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_1_SIZE 0x10000000 /* 256 MB */
-#define CFG_SDRAM_2_BASE 0xB0000000 /* SDRAM bank #1 32bits */
-#define CFG_SDRAM_2_SIZE 0x10000000 /* 256 MB */
-#define CFG_SDRAM_NUM_COL 10 /* 8, 9, 10 or 11 column address bits */
-#define CFG_SDRAM_NUM_ROW 14 /* 11, 12 or 13 row address bits */
-#define CFG_SDRAM_REFRESH 3 /* 0=OFF 1=2048 2=4096 3=8192 refresh */
-#define CFG_SDRAM_EXIT_PWD 25 /* ns exit power down delay */
-#define CFG_SDRAM_W2R_DELAY 1 /* write to read cycle delay > 0 */
-#define CFG_SDRAM_ROW_PRECHARGE_DELAY 18 /* ns */
-#define CFG_SDRAM_TMRD_DELAY 2 /* Load mode register cycle delay 1..4 */
-#define CFG_SDRAM_TWR_DELAY 1 /* LPDDR: 0=2ck 1=3ck; SDRAM: 0=1ck 1=2ck*/
-#define CFG_SDRAM_RAS_DELAY 42 /* ns ACTIVE-to-PRECHARGE delay */
-#define CFG_SDRAM_RRD_DELAY 12 /* ns ACTIVE-to-ACTIVE delay */
-#define CFG_SDRAM_RCD_DELAY 18 /* ns Row to Column delay */
-#define CFG_SDRAM_RC_DELAY 70 /* ns Row cycle delay (tRFC refresh to command)*/
-#define CFG_SDRAM_CLOCK_CYCLE_CL_1 0 /* ns clock cycle time estimated fo CL=1 0=force 3 for lpddr*/
-#define CFG_SDRAM_PARTIAL_ARRAY_SR 0 /* 0=full 1=half 2=quater 3=Eighth 4=Sixteenth */
-#define CFG_SDRAM_DRIVE_STRENGH 0 /* 0=Full-strength 1=half 2=quater 3=Eighth */
-#define CFG_SDRAM_BURST_LENGTH 3 /* 2^N BYTES (N=0..3) */
-#define CFG_SDRAM_SINGLE_ACCESS 0 /* 1= single access; 0 = Burst mode */
-#endif
-
-/*
- * Configuration for no NOR FLASH memory
- */
-#define CFG_NO_FLASH
-
-/*=====================*/
-/* Flash & Environment */
-/*=====================*/
-#define IMX27_NAND_16BITS 1
-#define CFG_MAX_NAND_DEVICE 1
-#define NAND_MAX_CHIPS 1
-#define CFG_NAND_BASE (0xD8000000)
-#define CONFIG_BOOT_TRACE_REG 0xAFFFFFF8 /* Addr to store traces of SPL boot */
-//#define NAND_ALLOW_ERASE_ALL
-//#define CONFIG_MTD_NAND_VERIFY_WRITE 1
-//#define CFG_NAND_SELECT_DEVICE 0 /* nand driver supports mutipl. chips */
-//#define CFG_NFC_DEBUG
-//#define CONFIG_MTD_DEBUG
-//#define CONFIG_MTD_DEBUG_VERBOSE 3
-/*=====================*/
-
-#define CONFIG_JFFS2_NAND 1
-#define CONFIG_JFFS2_CMDLINE 1
-
-#define CONFIG_NAND_U_BOOT
-#define CFG_NAND_U_BOOT_DST CFG_LOAD_ADDR /* Copy SPL+U-Boot here */
-#define CFG_NAND_U_BOOT_SIZE CFG_MONITOR_LEN /* Size is the partion size */
-/*
- * Environment setup. Definitions of monitor location and size with
- * definition of environment setup ends up in 2 possibilities.
- * 1. Embeded environment - in u-boot code is space for environment
- * 2. Environment is read from predefined sector of flash
- * Right now we support 2. possiblity, but expecting no env placed
- * on mentioned address right now. This also needs to provide whole
- * sector for it - for us 256Kb is really waste of memory. U-boot uses
- * default env. and until kernel parameters could be sent to kernel
- * env. has no sense to us.
- */
-
-#define CFG_MONITOR_BASE 0xAFF00000
-#define CFG_MONITOR_OFFSET 0x00000000
-#define CFG_MONITOR_LEN 0x000A0000 /* 640kB ( 5 flash blocks ) */
-#undef CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_IS_IN_NAND 1
-/*#define CFG_ENV_IS_NOWHERE
-*/
-#define CFG_ENV_OFFSET 0x000A0000 /* NAND offset address for now*/
-#define CFG_ENV_SIZE 0x00020000 /* 128kB */
-#define CFG_ENV_RANGE 0X00060000 /* 384kB ( 3 flash blocks ) */
-#define CONFIG_ENV_OVERWRITE 1 /* env is writable now */
-#define CONFIG_FIRMWARE_OFFSET 0x00100000
-#define CONFIG_FIRMWARE_LEN 0x00080000 /* 512kB ( 4 flash blocks ) */
-#define CONFIG_KERNEL_OFFSET 0x00180000
-#define CONFIG_KERNEL_LEN 0x00500000 /* 5.0MB */
-#define CONFIG_ROOTFS_OFFSET 0x00680000
-#define CONFIG_ROOTFS_LEN /* entire flash if not specified ~116MB*/
-
-/*
- * Default load address for user programs and kernel
- */
-#define CFG_LOAD_ADDR 0xA0000000
-#define CONFIG_LOADADDR 0xA0000000
-#define CFG_TFTP_LOADADDR 0xA0000000
-
-/*
- * Hardware drivers
- */
-
-/* FEC IMX27 ethernet chipset */
-#define CONFIG_DRIVER_FEC_IMX27 1
-#undef CONFIG_FEC_IMX27_DEBUG
-
-//#define CONFIG_NET_MULTI
-#define CONFIG_PHY_ADDR 0x1f
-#define CONFIG_MII 1 /* MII PHY management */
-
-/*-----------------------------------------------------------------------
- * FPGA stuff
- */
-#define CONFIG_FPGA
-#define CONFIG_FPGA_COUNT 1
-#define CONFIG_FPGA_XILINX
-#define CONFIG_FPGA_SPARTAN3
-#define CFG_FPGA_WAIT 20000 /* 20 ms */
-#define CFG_FPGA_PROG_FEEDBACK
-#define CFG_FPGA_CHECK_CTRLC
-#define CFG_FPGA_CHECK_ERROR
-//#define CONFIG_SYS_FPGA_IS_PROTO /* to be defined with apf27 board prototype*/
-
-/* FPGA program pin configuration */
-#define CFG_FPGA_PWR (GPIO_PORTF | 19) /* FPGA prog pin */
-#define CFG_FPGA_PRG (GPIO_PORTF | 11) /* FPGA prog pin */
-#define CFG_FPGA_CLK (GPIO_PORTF | 15) /* FPGA clk pin */
-#define CFG_FPGA_RDATA 0xD6000000 /* FPGA data addr */
-#define CFG_FPGA_WDATA 0xD6000000 /* FPGA data addr */
-#define CFG_FPGA_INIT (GPIO_PORTF | 12) /* FPGA init pin */
-#define CFG_FPGA_DONE (GPIO_PORTF | 9) /* FPGA done pin */
-#define CFG_FPGA_RW (GPIO_PORTF | 21) /* FPGA done pin */
-#define CFG_FPGA_CS (GPIO_PORTF | 22) /* FPGA done pin */
-#define CFG_FPGA_SUSPEND (GPIO_PORTF | 10) /* FPGA done pin */
-#define CFG_FPGA_RESET (GPIO_PORTF | 7) /* FPGA done pin */
-
-/*
- * I2C bus
- */
-
-#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
-
-#define CFG_I2C_SPEED 100000 /* 100 kHz */
-#define CFG_I2C_SLAVE 0x7F
-
-#define CONFIG_I2C_CMD_TREE
-#define CONFIG_I2C_MULTI_BUS 2
-#define CFG_I2C_NOPROBES { }
-
-# define CFG_I2C_EEPROM_ADDR 0x50 /* EEPROM 24LC02 */
-# define CFG_I2C_EEPROM_ADDR_LEN 1 /* bytes of address */
-/* mask of address bits that overflow into the "EEPROM chip address" */
-/*#define CFG_I2C_EEPROM_ADDR_OVERFLOW 0x00*/
-#define CFG_EEPROM_PAGE_WRITE_BITS 3
-#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 /* takes up to 10 msec */
-
-#define CONFIG_RTC_DS1374
-#define CFG_RTC_BUS_NUM 0
-/*#define CONFIG_MMC 1
-*/
-/*
- * External interfaces module
- *
- * CSCRxU_VAL:
- * 31| x | x | x x |x x x x| x x | x | x |x x x x|16
- * |SP |WP | BCD | BCS | PSZ |PME|SYNC| DOL |
- *
- * 15| x x | x x x x x x | x | x x x x | x x x x |0
- * | CNC | WSC |EW | WWS | EDC |
- *
- * CSCRxL_VAL:
- * 31| x x x x | x x x x | x x x x | x x x x |16
- * | OEA | OEN | EBWA | EBWN |
- * 15|x x x x| x |x x x |x x x x| x | x | x | x | 0
- * | CSA |EBC| DSZ | CSN |PSR|CRE|WRAP|CSEN|
- *
- * CSCRxA_VAL:
- * 31| x x x x | x x x x | x x x x | x x x x |16
- * | EBRA | EBRN | RWA | RWN |
- * 15| x | x x |x x x|x x|x x|x x| x | x | x | x | 0
- * |MUM| LAH | LBN |LBA|DWW|DCT|WWU|AGE|CNC2|FCE|
- */
-
-/* CS0 configuration for 16 bit nor flash */
-#define CFG_CS0U_VAL 0x0000CC03
-#define CFG_CS0L_VAL 0xa0330D01
-#define CFG_CS0A_VAL 0x00220800
-
-#define CFG_CS1U_VAL 0
-#define CFG_CS1L_VAL 0
-#define CFG_CS1A_VAL 0
-
-#define CFG_CS2U_VAL 0
-#define CFG_CS2L_VAL 0
-#define CFG_CS2A_VAL 0
-
-#define CFG_CS3U_VAL 0
-#define CFG_CS3L_VAL 0
-#define CFG_CS3A_VAL 0
-
-#define CFG_CS4U_VAL 0
-#define CFG_CS4L_VAL 0
-#define CFG_CS4A_VAL 0
-
-/* FPGA 16 bit data bus */
-#define CFG_CS5U_VAL 0x00000600
-#define CFG_CS5L_VAL 0x00000D01
-#define CFG_CS5A_VAL 0
-
-#define CFG_EIM_VAL 0x00002000
-
-/* FPGA specific settings */
-/* CLKO */
-#define CFG_CCSR_VAL 0x00000305
-/* drive strength CLKO set to 2*/
-#define CFG_DSCR10_VAL 0x00020000
-/* drive strength A1..A12 set to 2*/
-#define CFG_DSCR3_VAL 0x02AAAAA8
-/* drive strength ctrl*/
-#define CFG_DSCR7_VAL 0x00020880
-/* drive strength data*/
-#define CFG_DSCR2_VAL 0xAAAAAAAA
-
-
-/*
- * Default configuration for GPIOs and peripherals
- */
-#define CFG_DDIR_A_VAL 0x00000000
-#define CFG_OCR1_A_VAL 0x00000000
-#define CFG_OCR2_A_VAL 0x00000000
-#define CFG_ICFA1_A_VAL 0xFFFFFFFF
-#define CFG_ICFA2_A_VAL 0xFFFFFFFF
-#define CFG_ICFB1_A_VAL 0xFFFFFFFF
-#define CFG_ICFB2_A_VAL 0xFFFFFFFF
-#define CFG_DR_A_VAL 0x00000000
-#define CFG_GIUS_A_VAL 0xFFFFFFFF
-#define CFG_ICR1_A_VAL 0x00000000
-#define CFG_ICR2_A_VAL 0x00000000
-#define CFG_IMR_A_VAL 0x00000000
-#define CFG_GPR_A_VAL 0x00000000
-#define CFG_PUEN_A_VAL 0xFFFFFFFF
-
-#define CFG_DDIR_B_VAL 0x00000000
-#define CFG_OCR1_B_VAL 0x00000000
-#define CFG_OCR2_B_VAL 0x00000000
-#define CFG_ICFA1_B_VAL 0xFFFFFFFF
-#define CFG_ICFA2_B_VAL 0xFFFFFFFF
-#define CFG_ICFB1_B_VAL 0xFFFFFFFF
-#define CFG_ICFB2_B_VAL 0xFFFFFFFF
-#define CFG_DR_B_VAL 0x00000000
-#define CFG_GIUS_B_VAL 0xFF3FFFF0
-#define CFG_ICR1_B_VAL 0x00000000
-#define CFG_ICR2_B_VAL 0x00000000
-#define CFG_IMR_B_VAL 0x00000000
-#define CFG_GPR_B_VAL 0x00000000
-#define CFG_PUEN_B_VAL 0xFFFFFFFF
-
-#define CFG_DDIR_C_VAL 0x00000000
-#define CFG_OCR1_C_VAL 0x00000000
-#define CFG_OCR2_C_VAL 0x00000000
-#define CFG_ICFA1_C_VAL 0xFFFFFFFF
-#define CFG_ICFA2_C_VAL 0xFFFFFFFF
-#define CFG_ICFB1_C_VAL 0xFFFFFFFF
-#define CFG_ICFB2_C_VAL 0xFFFFFFFF
-#define CFG_DR_C_VAL 0x00000000
-#define CFG_GIUS_C_VAL 0xFFFFFFFF
-#define CFG_ICR1_C_VAL 0x00000000
-#define CFG_ICR2_C_VAL 0x00000000
-#define CFG_IMR_C_VAL 0x00000000
-#define CFG_GPR_C_VAL 0x00000000
-#define CFG_PUEN_C_VAL 0xFFFFFF87
-
-#define CFG_DDIR_D_VAL 0x00000000
-#define CFG_OCR1_D_VAL 0x00000000
-#define CFG_OCR2_D_VAL 0x00000000
-#define CFG_ICFA1_D_VAL 0xFFFFFFFF
-#define CFG_ICFA2_D_VAL 0xFFFFFFFF
-#define CFG_ICFB1_D_VAL 0xFFFFFFFF
-#define CFG_ICFB2_D_VAL 0xFFFFFFFF
-#define CFG_DR_D_VAL 0x00000000
-#define CFG_GIUS_D_VAL 0xFFFFFFFF
-#define CFG_ICR1_D_VAL 0x00000000
-#define CFG_ICR2_D_VAL 0x00000000
-#define CFG_IMR_D_VAL 0x00000000
-#define CFG_GPR_D_VAL 0x00000000
-#define CFG_PUEN_D_VAL 0xFFFFFFFF
-
-#define CFG_DDIR_E_VAL 0x00000000
-#define CFG_OCR1_E_VAL 0x00000000
-#define CFG_OCR2_E_VAL 0x00000000
-#define CFG_ICFA1_E_VAL 0xFFFFFFFF
-#define CFG_ICFA2_E_VAL 0xFFFFFFFF
-#define CFG_ICFB1_E_VAL 0xFFFFFFFF
-#define CFG_ICFB2_E_VAL 0xFFFFFFFF
-#define CFG_DR_E_VAL 0x00000000
-#define CFG_GIUS_E_VAL 0xFFFFCCF8
-#define CFG_ICR1_E_VAL 0x00000000
-#define CFG_ICR2_E_VAL 0x00000000
-#define CFG_IMR_E_VAL 0x00000000
-#define CFG_GPR_E_VAL 0x00000000
-#define CFG_PUEN_E_VAL 0xFFFFFFFF
-
-#define CFG_DDIR_F_VAL 0x00000000
-#define CFG_OCR1_F_VAL 0x00000000
-#define CFG_OCR2_F_VAL 0x00000000
-#define CFG_ICFA1_F_VAL 0xFFFFFFFF
-#define CFG_ICFA2_F_VAL 0xFFFFFFFF
-#define CFG_ICFB1_F_VAL 0xFFFFFFFF
-#define CFG_ICFB2_F_VAL 0xFFFFFFFF
-#define CFG_DR_F_VAL 0x00000000
-#define CFG_GIUS_F_VAL 0xFF7F8000
-#define CFG_ICR1_F_VAL 0x00000000
-#define CFG_ICR2_F_VAL 0x00000000
-#define CFG_IMR_F_VAL 0x00000000
-#define CFG_GPR_F_VAL 0x00000000
-#define CFG_PUEN_F_VAL 0xFFFFFFFF
-
-/* Enforce DDR signal strengh & enable USB/PP/DMA burst override bits */
-#define CFG_GPCR_VAL 0x0003000F
-
-/* LPDDR enable. latency hiding behavior enabled */
-//#define CFG_ESDMISC_VAL ESDMISC_MA10_SHARE+ESDMISC_MDDREN
-/*
- * safe value in case of erratic crash during boot
- * (seen with some prototype boards)*/
-#define CFG_ESDMISC_VAL ESDMISC_LHD+ESDMISC_MDDREN
-
-/* FMCR select num LPDDR RAMs and nand 16bits, 2KB pages */
-#if (CONFIG_NR_DRAM_BANKS == 1)
-#define CFG_FMCR_VAL 0xFFFFFFF9
-#elif (CONFIG_NR_DRAM_BANKS == 2)
-#define CFG_FMCR_VAL 0xFFFFFFFB
-#endif
-
-#define CFG_AIPI1_PSR0_VAL 0x20040304
-#define CFG_AIPI1_PSR1_VAL 0xDFFBFCFB
-#define CFG_AIPI2_PSR0_VAL 0x00000000
-#define CFG_AIPI2_PSR1_VAL 0xFFFFFFFF
-
-/* PCCR enable DMA FEC I2C1 IIM SDHC1 */
-#define CFG_PCCR0_VAL 0x05070400
-#define CFG_PCCR1_VAL 0xA14A0408
-
-/* CONFIG_SKIP_LOWLEVEL_INIT bypass lowlevel init in bootstrap mode */
-#undef CONFIG_SKIP_LOWLEVEL_INIT
-
-/*
- * From here, there should not be any user configuration.
- * All Equations are automatic
- */
-
-/* fixme none integer value (7.5ns) => 2*hclock = 15ns */
-#define CFG_2XHCLK_LGTH (2000/CONFIG_HCLK_FREQ) /* ns */
-
-/* USB 60 MHz ; ARM up to 400; HClK up to 133MHz*/
-#ifdef CFG_OSC26
-#define CSCR_MASK 0x0303800D
-#else
-#define CSCR_MASK 0x0300800D
-#endif
-#define CFG_CSCR_VAL\
- (CSCR_MASK \
- |((((CONFIG_SPLL_FREQ/CONFIG_USB_FREQ)-1)&0x07)<<28) \
- |((((CONFIG_MPLL_FREQ/CONFIG_ARM_FREQ)-1)&0x03)<<12) \
- |((((CONFIG_SYS_CLK_FREQ/CONFIG_HCLK_FREQ)-1)&0x03)<<8))
-
-/* SSIx CLKO NFC H264 MSHC */
-#define CFG_PCDR0_VAL\
- (((((CONFIG_SYS_CLK_FREQ/CONFIG_MSHC_FREQ)-1)&0x3F)<<0) \
- |((((CONFIG_HCLK_FREQ/CONFIG_NFC_FREQ)-1)&0x0F)<<6) \
- |(((((CONFIG_SYS_CLK_FREQ/CONFIG_H264_FREQ)-2)*2)&0x3F)<<10)\
- |(((((CONFIG_SYS_CLK_FREQ/CONFIG_SSI1_FREQ)-2)*2)&0x3F)<<16)\
- |(((CONFIG_CLK0_DIV)&0x07)<<22)\
- |(((CONFIG_CLK0_EN)&0x01)<<25)\
- |(((((CONFIG_SYS_CLK_FREQ/CONFIG_SSI2_FREQ)-2)*2)&0x3F)<<26))
-
-/* PERCLKx */
-#define CFG_PCDR1_VAL\
- (((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF1_FREQ)-1)&0x3F)<<0) \
- |((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF2_FREQ)-1)&0x3F)<<8) \
- |((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF3_FREQ)-1)&0x3F)<<16) \
- |((((CONFIG_SYS_CLK_FREQ/CONFIG_PERIF4_FREQ)-1)&0x3F)<<24))
-
-/* SDRAM controller programming Values */
-#if (((2*CFG_SDRAM_CLOCK_CYCLE_CL_1)>(3*CFG_2XHCLK_LGTH))\
- ||(CFG_SDRAM_CLOCK_CYCLE_CL_1<1))
-#define REG_FIELD_SCL_VAL 3
-#define REG_FIELD_SCLIMX_VAL 0
-#else
-#define REG_FIELD_SCL_VAL\
- ((2*CFG_SDRAM_CLOCK_CYCLE_CL_1+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)
-#define REG_FIELD_SCLIMX_VAL REG_FIELD_SCL_VAL
-#endif
-
-//#define REG_FIELD_SCL_VAL 3
-//#define REG_FIELD_SCLIMX_VAL 3
-
-#if ((2*CFG_SDRAM_RC_DELAY)>(16*CFG_2XHCLK_LGTH))
-#define REG_FIELD_SRC_VAL 0
-#else
-#define REG_FIELD_SRC_VAL\
- ((2*CFG_SDRAM_RC_DELAY+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)
-#endif
-
-/* TBD Power down timer ; PRCT Bit Field Encoding; burst length 8 ; FP = 0*/
-#define REG_ESDCTL_BASE_CONFIG (0x80020485\
- | (((CFG_SDRAM_NUM_ROW-11)&0x7)<<24)\
- | (((CFG_SDRAM_NUM_COL-8)&0x3)<<20)\
- | (((CFG_SDRAM_REFRESH)&0x7)<<13))
-
-#define CFG_NORMAL_RW_CMD ((0x0<<28)+REG_ESDCTL_BASE_CONFIG)
-#define CFG_PRECHARGE_CMD ((0x1<<28)+REG_ESDCTL_BASE_CONFIG)
-#define CFG_AUTOREFRESH_CMD ((0x2<<28)+REG_ESDCTL_BASE_CONFIG)
-#define CFG_SET_MODE_REG_CMD ((0x3<<28)+REG_ESDCTL_BASE_CONFIG)
-
-/* ESDRAMC Configuration Registers : force CL=3 to lpddr */
-#define CFG_SDRAM_ESDCFG_REGISTER_VAL (0x0\
- | (((((2*CFG_SDRAM_EXIT_PWD+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)-1)&0x3)<<21)\
- | (((CFG_SDRAM_W2R_DELAY-1)&0x1)<<20)\
- | (((((2*CFG_SDRAM_ROW_PRECHARGE_DELAY+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)-1)&0x3)<<18)\
- | (((CFG_SDRAM_TMRD_DELAY-1)&0x3)<<16)\
- | (((CFG_SDRAM_TWR_DELAY)&0x1)<<15)\
- | (((((2*CFG_SDRAM_RAS_DELAY+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)-1)&0x7)<<12)\
- | (((((2*CFG_SDRAM_RRD_DELAY+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)-1)&0x3)<<10)\
- | (((REG_FIELD_SCLIMX_VAL)&0x3)<<8)\
- | (((((2*CFG_SDRAM_RCD_DELAY+CFG_2XHCLK_LGTH-1)/CFG_2XHCLK_LGTH)-1)&0x7)<<4)\
- | (((REG_FIELD_SRC_VAL)&0x0F)<<0))
-
-/* Issue Mode register Command to SDRAM*/
-#define CFG_SDRAM_MODE_REGISTER_VAL\
- ((((CFG_SDRAM_BURST_LENGTH)&0x7)<<(0))\
- | (((REG_FIELD_SCL_VAL)&0x7)<<(4))\
- | ((0)<<(3)) /* sequentiql access */ \
- /*| (((CFG_SDRAM_SINGLE_ACCESS)&0x1)<<(1))*/)
-
-/* Issue Extended Mode register Command to SDRAM*/
-#define CFG_SDRAM_EXT_MODE_REGISTER_VAL\
- ((CFG_SDRAM_PARTIAL_ARRAY_SR<<0)\
- | (CFG_SDRAM_DRIVE_STRENGH<<(5))\
- | (1<<(CFG_SDRAM_NUM_COL+CFG_SDRAM_NUM_ROW+1+2)))
-
-/* Issue Precharge all Command to SDRAM*/
-#define CFG_SDRAM_PRECHARGE_ALL_VAL (1<<10)
-
-#endif /* __CONFIG_H */
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
new file mode 120000
index 0000000..fae6e25
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-1.3.4.h
@@ -0,0 +1 @@
+apf27.h
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
old mode 100755
new mode 100644
index 50a3176..6299e78
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2010.03.h
@@ -31,7 +31,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "1.7"
+#define CONFIG_ENV_VERSION "1.8"
#define CONFIG_IDENT_STRING " apf27 patch 2.5"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
@@ -214,7 +214,7 @@
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.jffs2\0" \
+ " ${serverpath}${board_name}-rootfs.arm.ubi\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" \
@@ -222,7 +222,7 @@
"flash_rootfs download_uboot flash_uboot\0" \
"unlock_regs=mw 10000008 0; mw 10020008 0\0" \
-#define CONFIG_BOOTCOMMAND "run jffsboot"
+#define CONFIG_BOOTCOMMAND "run ubifsboot"
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_MACH_TYPE MACH_TYPE_APF27
diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/apf27/apf27.h
index 816d3e1..6ef742f 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/apf27/apf27.h
@@ -32,7 +32,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_ENV_VERSION "1.9"
+#define CONFIG_ENV_VERSION "2.0"
#define CONFIG_IDENT_STRING " apf27 patch 2.2"
#define CONFIG_ARM926EJS 1 /* this is an ARM926EJS CPU */
@@ -203,7 +203,7 @@
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.ubifs\0" \
+ " ${serverpath}${board_name}-rootfs.arm.ubi\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" \
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index 29df405..0f0103d 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -26,7 +26,7 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.1"
+#define CONFIG_ENV_VERSION "0.2"
#define CONFIG_IDENT_STRING " apf51 patch 0.1"
/* High Level Configuration Options */
@@ -210,7 +210,7 @@
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.jffs2\0" \
+ " ${serverpath}${board_name}-rootfs.arm.ubi\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" \
@@ -218,7 +218,7 @@
"flash_rootfs download_uboot flash_uboot\0" \
"unlock_regs=mw 10000008 0; mw 10020008 0;TODO\0"
-#define CONFIG_BOOTCOMMAND "run jffsboot"
+#define CONFIG_BOOTCOMMAND "run ubifsboot"
#define CONFIG_SYS_AUTOLOAD "no"
#define CONFIG_MACH_TYPE MACH_TYPE_APF51
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-24 10:59:21
|
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 c88a59af4954791020cf113d713dbb5fbb3455aa (commit)
from 83047cbe95b7c79a83d07ea63ceaa6914445a686 (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 c88a59af4954791020cf113d713dbb5fbb3455aa
Author: Julien Boibessot <jul...@ar...>
Date: Wed Nov 24 11:58:53 2010 +0100
[BUILDROOT] Convert grep package to DOWNLOAD helper
-----------------------------------------------------------------------
Summary of changes:
.../136-grep-convert_to_DOWNLOAD_helper.patch | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/136-grep-convert_to_DOWNLOAD_helper.patch
diff --git a/patches/buildroot/136-grep-convert_to_DOWNLOAD_helper.patch b/patches/buildroot/136-grep-convert_to_DOWNLOAD_helper.patch
new file mode 100644
index 0000000..06de909
--- /dev/null
+++ b/patches/buildroot/136-grep-convert_to_DOWNLOAD_helper.patch
@@ -0,0 +1,19 @@
+Convert grep package to DOWNLOAD helper.
+
+Not needed on recent BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/grep/grep.mk
+===================================================================
+--- buildroot.orig/package/grep/grep.mk 2010-11-24 11:50:09.000000000 +0100
++++ buildroot/package/grep/grep.mk 2010-11-24 11:51:20.000000000 +0100
+@@ -12,7 +12,7 @@
+ GNUGREP_TARGET_BINARY:=bin/grep
+
+ $(DL_DIR)/$(GNUGREP_SOURCE):
+- $(WGET) -P $(DL_DIR) $(GNUGREP_SITE)/$(GNUGREP_SOURCE)
++ $(call DOWNLOAD,$(GNUGREP_SITE),$(GNUGREP_SOURCE))
+
+ grep-source: $(DL_DIR)/$(GNUGREP_SOURCE)
+
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2010-11-23 16:54:45
|
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 83047cbe95b7c79a83d07ea63ceaa6914445a686 (commit)
from b16ab9f0c40c4e6e9b92735b49cdde27a8d3569c (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 83047cbe95b7c79a83d07ea63ceaa6914445a686
Author: Fabien Marteau <fab...@ar...>
Date: Tue Nov 23 17:54:16 2010 +0100
[linux] Clean as5011 patch according to checkpatch.pl kernel-2.6.36 script
-----------------------------------------------------------------------
Summary of changes:
...us-joystick-adding_as5011_joystick_driver.patch | 123 ++++++++++++--------
1 files changed, 74 insertions(+), 49 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
index 101a7f9..27fcd3b 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/359-armadeus-joystick-adding_as5011_joystick_driver.patch
@@ -5,8 +5,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-08-02 17:22:53.000000000 +0200
-@@ -0,0 +1,429 @@
++++ linux-2.6.29.6/drivers/input/joystick/as5011.c 2010-11-23 17:47:47.000000000 +0100
+@@ -0,0 +1,454 @@
+/*
+ * Copyright (c) 2010 Fabien Marteau <fab...@ar...>
+ *
@@ -70,7 +70,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+#define AS5011_FUZZ 8
+#define AS5011_FLAT 40
+
-+static int g_num = 0; /* device counter */
++static int g_num = 1; /* device counter */
+
+static signed char as5011_i2c_read(struct i2c_client *client,
+ uint8_t aRegAddr);
@@ -84,22 +84,25 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+
+static irqreturn_t button_interrupt(int irq, void *dev_id)
+{
-+ struct as5011_platform_data *plat_dat = (struct as5011_platform_data *)dev_id;
++ struct as5011_platform_data *plat_dat =
++ (struct as5011_platform_data *)dev_id;
+ int ret;
+
+ ret = gpio_get_value(plat_dat->button_gpio);
-+ if (ret) {
++ if (ret)
+ input_report_key(plat_dat->input_dev, BTN_JOYSTICK, 0);
-+ } else {
++ else
+ input_report_key(plat_dat->input_dev, BTN_JOYSTICK, 1);
-+ }
+ input_sync(plat_dat->input_dev);
+ return IRQ_HANDLED;
+}
+
+static void as5011_update_axes(struct work_struct *work)
+{
-+ struct as5011_platform_data *plat_dat = container_of(work, struct as5011_platform_data, update_axes_work);
++ struct as5011_platform_data *plat_dat =
++ container_of(work,
++ struct as5011_platform_data,
++ update_axes_work);
+ signed char x, y;
+
+ x = as5011_i2c_read(plat_dat->i2c_client, AS5011_X_RES_INT);
@@ -111,7 +114,8 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+
+static irqreturn_t as5011_int_interrupt(int irq, void *dev_id)
+{
-+ struct as5011_platform_data *plat_dat = (struct as5011_platform_data *)dev_id;
++ struct as5011_platform_data *plat_dat =
++ (struct as5011_platform_data *)dev_id;
+
+ queue_work(plat_dat->workqueue, &plat_dat->update_axes_work);
+
@@ -128,12 +132,14 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+{
+ int ret;
+ uint8_t data[2] = { aRegAddr, aValue };
-+ struct i2c_msg msg = { client->addr, I2C_M_IGNORE_NAK, 2, (uint8_t *)data };
++ struct i2c_msg msg = { client->addr,
++ I2C_M_IGNORE_NAK,
++ 2,
++ (uint8_t *)data };
+
+ ret = i2c_transfer(client->adapter, &msg, 1);
-+ if (ret < 0) {
++ if (ret < 0)
+ return -EINVAL;
-+ }
+ return 1;
+}
+
@@ -143,26 +149,31 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ int ret;
+ uint8_t data[2];
+ struct i2c_msg msg_set[2];
-+ struct i2c_msg msg1 = {client->addr, I2C_M_REV_DIR_ADDR, 1, (uint8_t *)data};
-+ struct i2c_msg msg2 = {client->addr, I2C_M_RD|I2C_M_NOSTART, 1, (uint8_t *)data};
++ struct i2c_msg msg1 = { client->addr,
++ I2C_M_REV_DIR_ADDR,
++ 1,
++ (uint8_t *)data};
++ struct i2c_msg msg2 = { client->addr,
++ I2C_M_RD|I2C_M_NOSTART,
++ 1,
++ (uint8_t *)data};
+
+ data[0] = aRegAddr;
+ msg_set[0] = msg1;
+ msg_set[1] = msg2;
+
+ ret = i2c_transfer(client->adapter, msg_set, 2);
-+ if (ret < 0) {
++ if (ret < 0)
+ return -EINVAL;
-+ }
+
-+ if (data[0] & 0x80) {
-+ return (-1*(1+(~data[0])));
-+ } else {
++ if (data[0] & 0x80)
++ return -1*(1+(~data[0]));
++ else
+ return data[0];
-+ }
+}
+
-+static int as5011_probe(struct i2c_client *client, const struct i2c_device_id *id)
++static int as5011_probe(struct i2c_client *client,
++ const struct i2c_device_id *id)
+{
+ struct as5011_platform_data *plat_dat = client->dev.platform_data;
+ int retval = 0;
@@ -170,14 +181,16 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ plat_dat->num = g_num;
+ g_num++;
+
-+ retval = snprintf(plat_dat->workqueue_name, SIZE_NAME, "as5011_%d_workqueue", plat_dat->num);
-+ if (retval < 0)
-+ {
++ retval = snprintf(plat_dat->workqueue_name,
++ SIZE_NAME,
++ "as5011_%d_workqueue", plat_dat->num);
++ if (retval < 0) {
+ dev_err(&client->dev, "as5011: Failed to give workqueue name\n");
+ retval = -1;
+ goto workqueue_name_error;
+ }
-+ plat_dat->workqueue = create_singlethread_workqueue(plat_dat->workqueue_name);
++ plat_dat->workqueue =
++ create_singlethread_workqueue(plat_dat->workqueue_name);
+ if (plat_dat->workqueue == NULL) {
+ dev_err(&client->dev, "as5011: Failed to create workqueue\n");
+ retval = -EINVAL;
@@ -186,7 +199,8 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+
+ INIT_WORK(&plat_dat->update_axes_work, as5011_update_axes);
+
-+ if (!i2c_check_functionality(client->adapter,I2C_FUNC_PROTOCOL_MANGLING)) {
++ if (!i2c_check_functionality(client->adapter,
++ I2C_FUNC_PROTOCOL_MANGLING)) {
+ dev_err(&client->dev,
+ "i2c bus does not support protocol mangling, as5011 can't work\n");
+ retval = -ENODEV;
@@ -203,22 +217,30 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ }
+
+ plat_dat->input_dev->name = "Austria Microsystem as5011 joystick";
-+ plat_dat->input_dev->uniq = "Austria0";//XXX
++ plat_dat->input_dev->uniq = "Austria0";
+ plat_dat->input_dev->id.bustype = BUS_I2C;
-+ plat_dat->input_dev->phys = "/dev/input/event0";//XXX
++ plat_dat->input_dev->phys = "/dev/input/event0";
+ plat_dat->input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
-+ plat_dat->input_dev->keybit[BIT_WORD(BTN_JOYSTICK)] = BIT_MASK(BTN_JOYSTICK);
-+
-+ input_set_abs_params(plat_dat->input_dev, ABS_X,
-+ AS5011_MIN_AXIS, AS5011_MAX_AXIS, AS5011_FUZZ, AS5011_FLAT);
-+ input_set_abs_params(plat_dat->input_dev, ABS_Y,
-+ AS5011_MIN_AXIS, AS5011_MAX_AXIS, AS5011_FUZZ, AS5011_FLAT);
++ plat_dat->input_dev->keybit[BIT_WORD(BTN_JOYSTICK)] =
++ BIT_MASK(BTN_JOYSTICK);
++
++ input_set_abs_params(plat_dat->input_dev,
++ ABS_X,
++ AS5011_MIN_AXIS,
++ AS5011_MAX_AXIS,
++ AS5011_FUZZ,
++ AS5011_FLAT);
++ input_set_abs_params(plat_dat->input_dev,
++ ABS_Y,
++ AS5011_MIN_AXIS,
++ AS5011_MAX_AXIS,
++ AS5011_FUZZ,
++ AS5011_FLAT);
+
+ plat_dat->button_irq_name =
-+ (unsigned char *)kmalloc(sizeof(unsigned char)*SIZE_NAME,
++ kmalloc(sizeof(unsigned char)*SIZE_NAME,
+ GFP_KERNEL);
-+ if (plat_dat->button_irq_name == NULL)
-+ {
++ if (plat_dat->button_irq_name == NULL) {
+ dev_err(&client->dev,
+ "not enough memory for input devices irq name\n");
+ retval = -ENOMEM;
@@ -226,9 +248,11 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ }
+
+
-+ retval = snprintf(plat_dat->button_irq_name, SIZE_NAME, "as5011_%d_button", plat_dat->num);
-+ if (retval < 0)
-+ {
++ retval = snprintf(plat_dat->button_irq_name,
++ SIZE_NAME,
++ "as5011_%d_button",
++ plat_dat->num);
++ if (retval < 0) {
+ dev_err(&client->dev, "as5011: Failed to give button irq name\n");
+ retval = -EINVAL;
+ goto button_irq_name_error;
@@ -243,19 +267,20 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
+ }
+
+ plat_dat->int_irq_name =
-+ (unsigned char *)kmalloc(sizeof(unsigned char)*SIZE_NAME,
++ kmalloc(sizeof(unsigned char)*SIZE_NAME,
+ GFP_KERNEL);
-+ if (plat_dat->int_irq_name == NULL)
-+ {
++ if (plat_dat->int_irq_name == NULL) {
+ dev_err(&client->dev,
+ "not enough memory for input devices int irq name\n");
+ retval = -ENOMEM;
+ goto input_allocate_int_device_name_error;
+ }
+
-+ retval = snprintf(plat_dat->int_irq_name, SIZE_NAME, "as5011_%d_int", plat_dat->num);
-+ if (retval < 0)
-+ {
++ retval = snprintf(plat_dat->int_irq_name,
++ SIZE_NAME,
++ "as5011_%d_int",
++ plat_dat->num);
++ if (retval < 0) {
+ dev_err(&client->dev, "as5011: Failed to give int irq name\n");
+ retval = -EINVAL;
+ goto int_irq_name_error;
@@ -439,7 +464,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/as5011.c
Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
===================================================================
--- linux-2.6.29.6.orig/drivers/input/joystick/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-08-02 15:30:09.000000000 +0200
++++ linux-2.6.29.6/drivers/input/joystick/Kconfig 2010-11-23 17:43:25.000000000 +0100
@@ -254,6 +254,15 @@
To compile this driver as a module, choose M here: the
module will be called amijoy.
@@ -459,7 +484,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/Kconfig
Index: linux-2.6.29.6/drivers/input/joystick/Makefile
===================================================================
--- linux-2.6.29.6.orig/drivers/input/joystick/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-08-02 15:30:09.000000000 +0200
++++ linux-2.6.29.6/drivers/input/joystick/Makefile 2010-11-23 17:43:25.000000000 +0100
@@ -7,6 +7,7 @@
obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
obj-$(CONFIG_JOYSTICK_ADI) += adi.o
@@ -471,7 +496,7 @@ Index: linux-2.6.29.6/drivers/input/joystick/Makefile
Index: linux-2.6.29.6/include/linux/as5011.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/include/linux/as5011.h 2010-08-02 16:41:21.000000000 +0200
++++ linux-2.6.29.6/include/linux/as5011.h 2010-11-23 17:43:25.000000000 +0100
@@ -0,0 +1,72 @@
+#ifndef _AS5011_H
+#define _AS5011_H
hooks/post-receive
--
armadeus
|
|
From: jscheer <js...@us...> - 2010-11-23 11:06: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 b16ab9f0c40c4e6e9b92735b49cdde27a8d3569c (commit)
from 62e5977a7e5cfefa5d6e52a228096768ba9b21ac (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 b16ab9f0c40c4e6e9b92735b49cdde27a8d3569c
Author: Jeremie Scheer <jer...@ar...>
Date: Tue Nov 23 12:06:36 2010 +0100
[BUILDROOT] Add PPS Test scripts option to apf27 and apf9328 Buildroot's configuration files.
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 1 +
buildroot/configs/apf9328_defconfig | 1 +
.../target/device/armadeus/apf27/apf27_defconfig | 1 +
.../device/armadeus/apf9328/apf9328_defconfig | 1 +
4 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 563f061..55c6487 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -246,6 +246,7 @@ BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS is not set
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
#
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index feb77ba..899f806 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -243,6 +243,7 @@ BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS is not set
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
#
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index af3fcf7..0a9bfa4 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -379,6 +379,7 @@ BR2_PACKAGE_FPGAREGS=y
BR2_PACKAGE_IMXREGS=y
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS is not set
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 69cca30..86d76d2 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -375,6 +375,7 @@ BR2_PACKAGE_PKGCONFIG=y
# BR2_PACKAGE_IMXREGS is not set
# BR2_PACKAGE_IMXSSI is not set
BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_ARMADEUS_PPS_TEST_SCRIPTS is not set
# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-22 12:56:50
|
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 62e5977a7e5cfefa5d6e52a228096768ba9b21ac (commit)
from 8cbcaa3f49f9ad692184a0bc77b1a26b0ea4a862 (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 62e5977a7e5cfefa5d6e52a228096768ba9b21ac
Author: Julien Boibessot <jul...@ar...>
Date: Mon Nov 22 13:56:10 2010 +0100
[BUILDROOT] Convert tiff package to DOWNLOAD helper usage.
-----------------------------------------------------------------------
Summary of changes:
.../135-tiff-convert_to_DOWNLOAD_helper.patch | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/135-tiff-convert_to_DOWNLOAD_helper.patch
diff --git a/patches/buildroot/135-tiff-convert_to_DOWNLOAD_helper.patch b/patches/buildroot/135-tiff-convert_to_DOWNLOAD_helper.patch
new file mode 100644
index 0000000..80fbf1b
--- /dev/null
+++ b/patches/buildroot/135-tiff-convert_to_DOWNLOAD_helper.patch
@@ -0,0 +1,19 @@
+Convert tiff package to DOWNLOAD helper usage.
+
+No more needed with recent BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/tiff/tiff.mk
+===================================================================
+--- buildroot.orig/package/tiff/tiff.mk 2010-11-22 13:46:28.000000000 +0100
++++ buildroot/package/tiff/tiff.mk 2010-11-22 13:48:03.000000000 +0100
+@@ -11,7 +11,7 @@
+ TIFF_CAT:=$(ZCAT)
+
+ $(DL_DIR)/$(TIFF_SOURCE):
+- $(WGET) -P $(DL_DIR) $(TIFF_SITE)/$(TIFF_SOURCE)
++ $(call DOWNLOAD,$(TIFF_SITE),$(TIFF_SOURCE))
+
+ tiff-source: $(DL_DIR)/$(TIFF_SOURCE)
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2010-11-21 21:37:52
|
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 8cbcaa3f49f9ad692184a0bc77b1a26b0ea4a862 (commit)
from 3b6b1d0d193f573a8ef67feefc05e1e1a8a10be0 (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 8cbcaa3f49f9ad692184a0bc77b1a26b0ea4a862
Author: Julien Boibessot <jul...@ar...>
Date: Sun Nov 21 22:31:49 2010 +0100
[BUILDROOT] [2010.11] Updates to 2010.11-rc1
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 +-
patches/buildroot/2010.11/006-lcd4linux.patch | 4 +-
.../buildroot/2010.11/085-adds_gpm_package.patch | 2 +-
.../2010.11/086-bump_proftp_version.patch | 47 --------------------
...ckage.patch => 113-gpsd-add_package.integrated} | 3 +
patches/buildroot/2010.11/cleanup_buildroot.sh | 2 -
6 files changed, 8 insertions(+), 54 deletions(-)
delete mode 100644 patches/buildroot/2010.11/086-bump_proftp_version.patch
rename patches/buildroot/2010.11/{113-gpsd-add_package.patch => 113-gpsd-add_package.integrated} (99%)
diff --git a/Makefile b/Makefile
index e50b29f..7a0e099 100644
--- a/Makefile
+++ b/Makefile
@@ -36,8 +36,8 @@ else
#BUILDROOT_VERSION:=2010.11
#BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
#BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/$(BUILDROOT_VERSION)
-BUILDROOT_VERSION:=20101015
-BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots
+BUILDROOT_VERSION:=2010.11-rc1
+BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads
BUILDROOT_PATCH_DIR:=$(ARMADEUS_TOPDIR)/patches/buildroot/2010.11
ARMADEUS_CONFIG_DIR:=$(BUILDROOT_DIR)/configs
endif
diff --git a/patches/buildroot/2010.11/006-lcd4linux.patch b/patches/buildroot/2010.11/006-lcd4linux.patch
index d16e71b..ee85be7 100644
--- a/patches/buildroot/2010.11/006-lcd4linux.patch
+++ b/patches/buildroot/2010.11/006-lcd4linux.patch
@@ -6,10 +6,10 @@ Index: buildroot/package/Config.in
===================================================================
--- buildroot.orig/package/Config.in 2010-06-23 14:09:19.000000000 +0200
+++ buildroot/package/Config.in 2010-06-23 14:09:53.000000000 +0200
-@@ -175,6 +175,7 @@
- source "package/i2c-tools/Config.in"
+@@ -177,6 +177,7 @@
source "package/input-tools/Config.in"
source "package/iostat/Config.in"
+ source "package/kbd/Config.in"
+source "package/lcd4linux/Config.in"
source "package/lm-sensors/Config.in"
source "package/lvm2/Config.in"
diff --git a/patches/buildroot/2010.11/085-adds_gpm_package.patch b/patches/buildroot/2010.11/085-adds_gpm_package.patch
index 6997db4..3786f30 100644
--- a/patches/buildroot/2010.11/085-adds_gpm_package.patch
+++ b/patches/buildroot/2010.11/085-adds_gpm_package.patch
@@ -128,9 +128,9 @@ Index: buildroot/package/Config.in
source "package/genext2fs/Config.in"
source "package/genromfs/Config.in"
+source "package/gpm/Config.in"
+ source "package/gpsd/Config.in"
source "package/gvfs/Config.in"
source "package/hal/Config.in"
- if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
Index: buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
diff --git a/patches/buildroot/2010.11/086-bump_proftp_version.patch b/patches/buildroot/2010.11/086-bump_proftp_version.patch
deleted file mode 100644
index 21f44c3..0000000
--- a/patches/buildroot/2010.11/086-bump_proftp_version.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: buildroot/package/proftpd/proftpd.mk
-===================================================================
---- buildroot.orig/package/proftpd/proftpd.mk 2010-06-17 16:45:11.000000000 +0200
-+++ buildroot/package/proftpd/proftpd.mk 2010-06-17 16:49:27.000000000 +0200
-@@ -3,7 +3,7 @@
- # proftpd
- #
- #############################################################
--PROFTPD_VERSION:=1.3.1
-+PROFTPD_VERSION:=1.3.2
- PROFTPD_SOURCE:=proftpd-$(PROFTPD_VERSION).tar.bz2
- PROFTPD_SITE:=ftp://ftp.proftpd.org/distrib/source/
- PROFTPD_DIR:=$(BUILD_DIR)/proftpd-$(PROFTPD_VERSION)
-Index: buildroot/package/proftpd/proftpd-1.3.1-fix-kernel-header-capability-version.patch
-===================================================================
---- buildroot.orig/package/proftpd/proftpd-1.3.1-fix-kernel-header-capability-version.patch 2010-06-17 16:45:11.000000000 +0200
-+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
-@@ -1,12 +0,0 @@
----- a/lib/libcap/libcap.h 2008-04-24 19:46:29.475883739 +0200
--+++ b/lib/libcap/libcap.h 2008-04-24 19:48:31.116088563 +0200
--@@ -52,7 +52,8 @@
-- */
--
-- #if !defined(_LINUX_CAPABILITY_VERSION) || \
--- (_LINUX_CAPABILITY_VERSION != 0x19980330)
--+ ((_LINUX_CAPABILITY_VERSION != 0x19980330) && \
--+ (_LINUX_CAPABILITY_VERSION != 0x20071026))
--
-- # error "Kernel <linux/capability.h> does not match library"
-- # error "file "libcap.h" --> fix and recompile libcap"
-Index: buildroot/package/proftpd/proftpd-1.3.2-fix-kernel-header-capability-version.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/proftpd/proftpd-1.3.2-fix-kernel-header-capability-version.patch 2010-06-17 16:49:27.000000000 +0200
-@@ -0,0 +1,12 @@
-+--- a/lib/libcap/libcap.h 2008-04-24 19:46:29.475883739 +0200
-++++ b/lib/libcap/libcap.h 2008-04-24 19:48:31.116088563 +0200
-+@@ -52,7 +52,8 @@
-+ */
-+
-+ #if !defined(_LINUX_CAPABILITY_VERSION_1) || \
-+- (_LINUX_CAPABILITY_VERSION_1 != 0x19980330)
-++ ((_LINUX_CAPABILITY_VERSION_1 != 0x19980330) && \
-++ (_LINUX_CAPABILITY_VERSION_1 != 0x20071026))
-+
-+ # error "Kernel <linux/capability.h> does not match library"
-+ # error "file "libcap.h" --> fix and recompile libcap"
diff --git a/patches/buildroot/2010.11/113-gpsd-add_package.patch b/patches/buildroot/2010.11/113-gpsd-add_package.integrated
similarity index 99%
rename from patches/buildroot/2010.11/113-gpsd-add_package.patch
rename to patches/buildroot/2010.11/113-gpsd-add_package.integrated
index 5a7456e..7f724f4 100644
--- a/patches/buildroot/2010.11/113-gpsd-add_package.patch
+++ b/patches/buildroot/2010.11/113-gpsd-add_package.integrated
@@ -1,5 +1,8 @@
Adds gpsd package to BR.
+Integrated in latest BR. To do: check if some of our modifications are
+not also useful.
+
Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index 14fe7f9..b5ec0ef 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -8,7 +8,6 @@ rm -rf buildroot/package/games/quake-pak/
rm -rf buildroot/package/games/sdlquake/
rm -rf buildroot/package/gpm/
rm -rf buildroot/package/pygame/
-rm -f buildroot/package/proftpd/proftpd-1.3.2-fix-kernel-header-capability-version.patch
rm -rf buildroot/package/uucp/
rm -f buildroot/package/multimedia/libsndfile/libsndfile-1.0.*-srconly.patch
rm -rf buildroot/package/multimedia/flite/
@@ -21,7 +20,6 @@ rm -f buildroot/toolchain/gcc/4.2.4/999-4.2.4-armeabi-aapcs-linux.patch
rm -rf buildroot/package/games/wolf4sdl/
rm -rf buildroot/package/ussp-push/
rm -rf buildroot/package/openobex/
-rm -rf buildroot/package/gpsd/
rm -rf buildroot/package/lmbench/
rm -rf buildroot/package/tslib/
rm -rf buildroot/package/openssh/
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2010-11-21 13:13: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 3b6b1d0d193f573a8ef67feefc05e1e1a8a10be0 (commit)
via 744f61287cec203ccc03e9088a1a3f5342fa7407 (commit)
from ec24802831d611c30609a2fd232e82c683c2919a (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 3b6b1d0d193f573a8ef67feefc05e1e1a8a10be0
Merge: 744f61287cec203ccc03e9088a1a3f5342fa7407 ec24802831d611c30609a2fd232e82c683c2919a
Author: Eric Jarrige <eri...@ar...>
Date: Sun Nov 21 14:13:42 2010 +0100
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 744f61287cec203ccc03e9088a1a3f5342fa7407
Author: Eric Jarrige <eri...@ar...>
Date: Sun Nov 21 11:34:16 2010 +0100
[UBOOT] Fix EMI clock computation when derived from AHB clock
-----------------------------------------------------------------------
Summary of changes:
.../target/u-boot/u-boot-2010.03-400-imx51.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/u-boot/u-boot-2010.03-400-imx51.patch b/buildroot/target/u-boot/u-boot-2010.03-400-imx51.patch
index 65efc3f..77183b9 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-400-imx51.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-400-imx51.patch
@@ -108,7 +108,7 @@ diff -purN u-boot-2010.03-ref/cpu/arm_cortexa8/mx51/clock.c u-boot-2010.03/cpu/a
+ emi_podf = (emi_podf & MXC_CCM_CBCDR_EMI_PODF_MASK) >>
+ MXC_CCM_CBCDR_EMI_PODF_OFFSET;
+ /* if emi_clock_sel */
-+ if (__raw_readl(&mxc_ccm->cbcmr) & MXC_CCM_CBCDR_EMI_CLK_SEL)
++ if (__raw_readl(&mxc_ccm->cbcdr) & MXC_CCM_CBCDR_EMI_CLK_SEL)
+ return get_ahb_clk()/ (emi_podf + 1);
+ else
+ return get_periph_clk() / (emi_podf + 1);
hooks/post-receive
--
armadeus
|
