armadeus-commitlog Mailing List for armadeus (Page 98)
Brought to you by:
sszy
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: Nicolas <th...@us...> - 2011-02-15 15:22:48
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6e06b1b14267f97e001fcaf8d2c05e61a12d02be (commit)
from 0aa57e2a8f7c19bcde241b840a537b7673aece20 (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 6e06b1b14267f97e001fcaf8d2c05e61a12d02be
Author: Nicolas Colombain <nic...@ar...>
Date: Tue Feb 15 16:20:15 2011 +0100
[BUILDROOT] add tfp410ctrl user space program for APF51Dev
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/Config.in | 1 +
buildroot/package/armadeus/tfp410ctrl/Config.in | 8 +
buildroot/package/armadeus/tfp410ctrl/tfp410.mk | 41 +++
.../packages/{ch7024ctrl => tfp410ctrl}/Makefile | 14 +-
target/packages/tfp410ctrl/tfp410ctrl.c | 368 ++++++++++++++++++++
.../packages/tfp410ctrl/tfp410ctrl.h | 44 ++-
6 files changed, 454 insertions(+), 22 deletions(-)
create mode 100644 buildroot/package/armadeus/tfp410ctrl/Config.in
create mode 100644 buildroot/package/armadeus/tfp410ctrl/tfp410.mk
copy target/packages/{ch7024ctrl => tfp410ctrl}/Makefile (67%)
create mode 100644 target/packages/tfp410ctrl/tfp410ctrl.c
copy software/demos/ApfDacClientServer/src/Networking/ApfNetworkDefs.h => target/packages/tfp410ctrl/tfp410ctrl.h (53%)
mode change 100755 => 100644
diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index d03f031..11e7d09 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -1,6 +1,7 @@
menu "Armadeus specific tools/utilities"
source package/armadeus/ad9889ctrl/Config.in
+source package/armadeus/tfp410ctrl/Config.in
source package/armadeus/as_devices/Config.in
source package/armadeus/ch7024ctrl/Config.in
source package/armadeus/demos/Config.in
diff --git a/buildroot/package/armadeus/tfp410ctrl/Config.in b/buildroot/package/armadeus/tfp410ctrl/Config.in
new file mode 100644
index 0000000..e60d138
--- /dev/null
+++ b/buildroot/package/armadeus/tfp410ctrl/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_TFP410CTRL
+ bool "tfp410ctrl"
+ depends on BR2_TARGET_ARMADEUS
+ default n
+ help
+ Build TFP410 control tool. It allows you to configure the HDMI/DVI
+ output of the APF51Dev directly from Linux userspace (command tfp410ctrl).
+
diff --git a/buildroot/package/armadeus/tfp410ctrl/tfp410.mk b/buildroot/package/armadeus/tfp410ctrl/tfp410.mk
new file mode 100644
index 0000000..0dee387
--- /dev/null
+++ b/buildroot/package/armadeus/tfp410ctrl/tfp410.mk
@@ -0,0 +1,41 @@
+#############################################################
+#
+# tfp410 control tool
+#
+#############################################################
+
+TFP410CTRL_VER:=1.0
+TFP410CTRL_SOURCE:=$(TOPDIR)/../target/packages/tfp410ctrl
+TFP410CTRL_DIR:=$(BUILD_DIR)/tfp410ctrl-$(TFP410CTRL_VER)
+TFP410CTRL_CAT:=zcat
+TFP410CTRL_BINARY:=tfp410ctrl
+TFP410CTRL_TARGET_BINARY:=usr/bin/tfp410ctrl
+
+$(TFP410CTRL_DIR)/tfp410ctrl.c:
+ mkdir -p $(TFP410CTRL_DIR)/
+ cp $(TFP410CTRL_SOURCE)/* $(TFP410CTRL_DIR)/
+
+$(TFP410CTRL_DIR)/$(TFP410CTRL_BINARY): $(TFP410CTRL_DIR)/tfp410ctrl.c $(TFP410CTRL_DIR)/tfp410ctrl.h
+ $(MAKE) CC="$(TARGET_CC)" -C $(TFP410CTRL_DIR)
+
+$(TARGET_DIR)/$(TFP410CTRL_TARGET_BINARY): $(TFP410CTRL_DIR)/$(TFP410CTRL_BINARY)
+ install -D $< $@
+ $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(TFP410CTRL_TARGET_BINARY)
+
+tfp410ctrl: $(TARGET_DIR)/$(TFP410CTRL_TARGET_BINARY)
+
+tfp410ctrl-clean:
+ rm -f $(TARGET_DIR)/$(TFP410CTRL_TARGET_BINARY)
+ -$(MAKE) -C $(TFP410CTRL_DIR) clean
+
+tfp410ctrl-dirclean:
+ rm -rf $(TFP410CTRL_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_TFP410CTRL)),y)
+TARGETS+=tfp410ctrl
+endif
diff --git a/target/packages/ch7024ctrl/Makefile b/target/packages/tfp410ctrl/Makefile
similarity index 67%
copy from target/packages/ch7024ctrl/Makefile
copy to target/packages/tfp410ctrl/Makefile
index 36cf434..51569b1 100644
--- a/target/packages/ch7024ctrl/Makefile
+++ b/target/packages/tfp410ctrl/Makefile
@@ -1,5 +1,5 @@
#
-# Makefile for the Armadeus SVIDEO controler CH7024
+# Makefile for the Armadeus HDMI/DVI controler TFP410
#
CFLAGS = -Wall -O
@@ -10,10 +10,10 @@ PWD := $(shell pwd)
#HEADERS =
-SOURCES = ch7024.c
-OBJECTS = ch7024.o
+SOURCES = tfp410ctrl.c
+OBJECTS = tfp410ctrl.o
-TARGET = ch7024
+TARGET = tfp410ctrl
####### Implicit rules
@@ -41,7 +41,7 @@ TARGET = ch7024
$(TARGET): $(OBJECTS) Makefile $(HEADERS)
@echo
- @echo "Building CH7024 control programm..."
+ @echo "Building tfp410ctrl control programm..."
$(CC) $(OBJECTS) $(CFLAGS) $(INCLUDES) -o $(TARGET)
@@ -51,9 +51,9 @@ clean:
-rm -f $(TARGET)
-rm -f *.o *~ core
-ch7024.o: ch7024.c ch7024.h Makefile
+tfp410ctrl.o: tfp410ctrl.c tfp410ctrl.h Makefile
@echo
- $(CC) -c $(CFLAGS) $(INCLUDES) ch7024.c
+ $(CC) -c $(CFLAGS) $(INCLUDES) tfp410ctrl.c
diff --git a/target/packages/tfp410ctrl/tfp410ctrl.c b/target/packages/tfp410ctrl/tfp410ctrl.c
new file mode 100644
index 0000000..087abf0
--- /dev/null
+++ b/target/packages/tfp410ctrl/tfp410ctrl.c
@@ -0,0 +1,368 @@
+/*
+** ARMADEUS Systems
+**
+** Copyright (C) 2011 The source forge armadeus systems team
+**
+** 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.
+**
+** tfp410ctrl: manage the TFP410 Video controller
+**
+** authors: th...@us...
+*/
+
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <linux/i2c.h>
+#include <linux/i2c-dev.h>
+
+#include <sys/ioctl.h>
+#include "tfp410ctrl.h"
+#define DEBUG_TFP410 1
+
+#define VERSION "0.2alpha"
+#define CONF_FILE "tfp410.conf"
+#define MAX_DUMP_LINE 100
+/****************************************************************************************************************************/
+
+/* MENU */
+void usage()
+{
+ printf("\ntfp410ctrl utility ver %s Armadeus\n", VERSION);
+ printf("q: quit\n");
+ printf("m: modify\n");
+ printf("d: dump tfp410 registers\n");
+ printf("s: save\n");
+ printf("l: load\n");
+ printf("other: this menu\n");
+}
+
+void registerMenu()
+{
+ printf("\n1. CTL_1_MODE");
+ printf("\n2. CTL_2_MODE");
+ printf("\n3. CTL_3_MODE");
+ printf("\n4. CFG");
+ printf("\n5. DE_DLY");
+ printf("\n6. DE_CTL");
+ printf("\n7. DE_TOP");
+ printf("\n8. DE_CNT");
+ printf("\n9. DE_LIN\n");
+}
+
+
+static inline __s32 i2c_smbus_access(int file, char read_write, __u8 command,
+ int size, union i2c_smbus_data *data)
+{
+ struct i2c_smbus_ioctl_data args;
+
+ args.read_write = read_write;
+ args.command = command;
+ args.size = size;
+ args.data = data;
+ return ioctl(file, I2C_SMBUS, &args);
+}
+
+/* Read a byte on the I2C bus
+ This is done by writing the register address
+ we want to access and then by reading this register
+ @param fd: file descriptor of the device
+ @param dev: address of the device on I2C bus
+ @param reg: register to access
+ @param buf: buffer used to store the result
+ @return : -1 in case of error otherwise 0
+ */
+int read_byte(int fd, unsigned char dev, unsigned char reg, unsigned char *buf)
+{
+ union i2c_smbus_data data;
+
+ /* configure I2C_SLAVE */
+ if (ioctl(fd, I2C_SLAVE, dev) < 0) {
+ perror("Ioctl error: ");
+ return -1;
+ }
+
+ if (i2c_smbus_access(fd, I2C_SMBUS_READ, reg,
+ I2C_SMBUS_BYTE_DATA, &data)) {
+ printf("Read error\n");
+ return -1;
+ } else {
+ *buf = 0x0FF & data.byte;
+ return 0;
+ }
+}
+
+int read_word(int fd, unsigned char dev, unsigned char reg, unsigned short *buf)
+{
+ union i2c_smbus_data data;
+
+ /* configure I2C_SLAVE */
+ if (ioctl(fd, I2C_SLAVE, dev) < 0) {
+ perror("Ioctl error: ");
+ return -1;
+ }
+
+ if (i2c_smbus_access(fd, I2C_SMBUS_READ, reg,
+ I2C_SMBUS_WORD_DATA, &data)) {
+ printf("Read error\n");
+ return -1;
+ } else {
+ *buf = 0xFFFF & data.word;
+ return 0;
+ }
+}
+
+
+/* Write a byte on the I2C bus
+ @param fd: file descriptor of the device
+ @param dev: address of the device on I2C bus
+ @param reg: register to access
+ @param value: value to write
+ @return : -1 in case of error otherwise 0
+ */
+int write_byte(int fd, unsigned char dev, unsigned char reg, unsigned char value)
+{
+ union i2c_smbus_data data;
+ data.byte = value;
+
+ /* configure I2C_SLAVE */
+ if (ioctl(fd, I2C_SLAVE, dev) < 0) {
+ perror("Ioctl error: ");
+ return -1;
+ }
+
+ return i2c_smbus_access(fd, I2C_SMBUS_WRITE, reg,
+ I2C_SMBUS_BYTE_DATA, &data);
+
+ return 0;
+}
+
+int write_word(int fd, unsigned char dev, unsigned char reg, unsigned short value)
+{
+ union i2c_smbus_data data;
+ data.word = value;
+
+ /* configure I2C_SLAVE */
+ if (ioctl(fd, I2C_SLAVE, dev) < 0) {
+ perror("Ioctl error: ");
+ return -1;
+ }
+
+ return i2c_smbus_access(fd, I2C_SMBUS_WRITE, reg,
+ I2C_SMBUS_WORD_DATA, &data);
+
+ return 0;
+}
+
+/* dump the register values on the screen if destFile is NULL or in a file
+ */
+void dumpReg(int fd, int regAddr, char* info, FILE* destFile)
+{
+ unsigned short buf = 0;
+ char dumpString[MAX_DUMP_LINE];
+
+ if (regAddr > DE_TOP_REG)
+ read_word(fd, TFP410_I2C_SLAVE_ADDR, regAddr, &buf);
+ else
+ read_byte(fd, TFP410_I2C_SLAVE_ADDR, regAddr, (unsigned char*)&buf);
+
+ if (destFile == NULL){
+ sprintf(dumpString, "%s %02X:%04X\t", info, regAddr, buf);
+ printf("%s\n", dumpString);
+ } else {
+ sprintf(dumpString, "%02X:%04X\t", regAddr, buf);
+ fprintf(destFile, "%s\n", dumpString);
+ }
+}
+
+/* dump the register values on the screen if destFile is NULL or in a file
+ @param fd: file descriptor of the TFP410
+ @param destFile: file in which to write if used otherwise ""
+ */
+void dump(int fd, FILE* destFile)
+{
+
+ if (destFile == NULL)
+ printf("\t\t Ad:Va\n");
+
+ dumpReg(fd, CTL_1_MODE_REG, "CTL_1_MODE:\t", destFile);
+ dumpReg(fd, CTL_2_MODE_REG, "CTL_2_MODE:\t", destFile);
+ dumpReg(fd, CTL_3_MODE_REG, "CTL_3_MODE:\t", destFile);
+ dumpReg(fd, CFG_REG, "CFG:\t\t", destFile);
+ dumpReg(fd, DE_DLY_REG, "DE_DLY:\t\t", destFile);
+ dumpReg(fd, DE_CTL_REG, "DE_CTL:\t\t", destFile);
+ dumpReg(fd, DE_TOP_REG, "DE_TOP:\t\t", destFile);
+ dumpReg(fd, DE_CNT_REG, "DE_CNT:\t\t", destFile);
+ dumpReg(fd, DE_LIN_REG, "DE_LIN:\t\t", destFile);
+ dumpReg(fd, H_RES_REG, "H_RES:\t\t", destFile);
+ dumpReg(fd, V_RES_REG, "V_RES:\t\t", destFile);
+}
+
+/* load the TFP410 registers with the values contained in the given file
+ @param fd: file descriptor of the TFP410
+ @param fileName: file containing the values. If "" then the name has to be entered
+ */
+void load(int fd, char* fileName)
+{
+ char line[MAX_DUMP_LINE];
+ char tempFileName[MAX_DUMP_LINE];
+ FILE *fd_conf = NULL;
+ unsigned int regAddr, val;
+
+ if (strlen(fileName) == 0) {
+ printf("Enter file name: ");
+ fgets(tempFileName, sizeof(tempFileName), stdin);
+ tempFileName[strlen(tempFileName)-1] = '\0'; /* suppress \n */
+ }
+ else {
+ strcpy(tempFileName, fileName);
+ }
+
+ if ((fd_conf = fopen(tempFileName, "r")) == NULL) {
+ perror("Open error: ");
+ exit (1);
+ }
+ while (fgets(line, MAX_DUMP_LINE, fd_conf) != NULL) {
+ sscanf(line,"%2X%*c%4X", ®Addr, &val);
+ printf("reg %02x, value %04x\n", regAddr, val);
+ if (regAddr > DE_TOP_REG)
+ write_word (fd, TFP410_I2C_SLAVE_ADDR, regAddr, val);
+ else
+ write_byte (fd, TFP410_I2C_SLAVE_ADDR, regAddr, val);
+ }
+ if (fd_conf != NULL)
+ fclose(fd_conf);
+}
+
+void modifyRegister(int fd, int regAddr)
+{
+ int regValue;
+ char string[10]; // user input string
+
+ printf("Reg value:");
+ fgets(string, sizeof(string), stdin);
+ if ((regAddr == DE_CNT_REG) || (regAddr == DE_LIN_REG)) {
+ sscanf(string, "%4x", ®Value);
+ write_word(fd, TFP410_I2C_SLAVE_ADDR, regAddr, regValue);
+ } else {
+ sscanf(string, "%2x", ®Value);
+ write_byte(fd, TFP410_I2C_SLAVE_ADDR, regAddr, regValue);
+ }
+}
+
+void tfp410_init( int fd )
+{
+ /* exit power down mode */
+ write_byte(fd, TFP410_I2C_SLAVE_ADDR, CTL_1_MODE_REG, 0xBD);
+ /* configure MSEN/PO1 as hotplug detect pin */
+ write_byte(fd, TFP410_I2C_SLAVE_ADDR, CTL_2_MODE_REG, 0x32);
+
+}
+
+int main(int argc, char *argv[])
+{
+ int fd; // TFP410 file descriptor
+ FILE *fd_conf = NULL; // config file
+ char string[10]; // user input string
+ unsigned short buf; // buf to store I2C command/data
+ char* bus = "/dev/i2c-1";
+
+ if (argc > 2) { /* too many args */
+ usage();
+ exit(1);
+ } else if (argc == 2) { /* i2c bus */
+ bus = argv[1];
+ }
+
+ /* open I2C /dev */
+ if ((fd = open(bus, O_RDWR)) < 0) {
+ perror("Open error: ");
+ exit (1);
+ }
+
+ /* configure I2C_SLAVE */
+ if (ioctl(fd, I2C_SLAVE, TFP410_I2C_SLAVE_ADDR) < 0) {
+ perror("Ioctl error: ");
+ exit (1);
+ }
+
+ /* check TFP410 presence */
+ if (!read_word(fd, TFP410_I2C_SLAVE_ADDR, DEV_ID_REG, &buf)) {
+ printf("DEV_ID = %x\n", buf);
+ if ((DEV_ID != buf)) {
+ printf("incorrect dev id. Exiting\n");
+ exit(1);
+ }
+ } else {
+ printf("TFP410 not found. Exiting\n");
+ exit(1);
+ }
+
+ tfp410_init(fd);
+ usage();
+ while(1) {
+ fgets(string, sizeof(string), stdin);
+ if (string[0] == 'q') { /* Exit */
+ exit(0);
+ }
+ else if (string[0] == 'm') { /* Modify registers */
+ registerMenu();
+ fgets(string, sizeof(string), stdin);
+ switch (string[0]){
+ case '1': modifyRegister(fd, CTL_1_MODE_REG); break;
+ case '2': modifyRegister(fd, CTL_2_MODE_REG); break;
+ case '3': modifyRegister(fd, CTL_3_MODE_REG); break;
+ case '4': modifyRegister(fd, CFG_REG); break;
+ case '5': modifyRegister(fd, DE_DLY_REG); break;
+ case '6': modifyRegister(fd, DE_CTL_REG); break;
+ case '7': modifyRegister(fd, DE_TOP_REG); break;
+ case '8': modifyRegister(fd, DE_CNT_REG); break;
+ case '9': modifyRegister(fd, DE_LIN_REG); break;
+ default: printf("invalid selection\n"); break;
+ }
+ }
+ else if (string[0] == 'd') { /* Dump to screen */
+ dump(fd, fd_conf);
+ }
+ else if (string[0] == 's') { /* Save to file */
+ if ((fd_conf = fopen(CONF_FILE, "w")) < 0) {
+ perror("Open error: ");
+ exit (1);
+ }
+ dump(fd, fd_conf);
+ if (fd_conf != NULL) {
+ fclose(fd_conf);
+ }
+ printf("Data saved to conf file\n");
+ }
+ else if (string[0] == 'l') { /* load from file */
+ load(fd, "");
+ } else {
+ usage();
+ }
+ };
+
+ if (fd >= 0) {
+ close(fd);
+ }
+
+ exit (0);
+}
+
diff --git a/software/demos/ApfDacClientServer/src/Networking/ApfNetworkDefs.h b/target/packages/tfp410ctrl/tfp410ctrl.h
old mode 100755
new mode 100644
similarity index 53%
copy from software/demos/ApfDacClientServer/src/Networking/ApfNetworkDefs.h
copy to target/packages/tfp410ctrl/tfp410ctrl.h
index 083d5cc..617348b
--- a/software/demos/ApfDacClientServer/src/Networking/ApfNetworkDefs.h
+++ b/target/packages/tfp410ctrl/tfp410ctrl.h
@@ -1,7 +1,7 @@
/*
-** THE ARMADEUS PROJECT
+** ARMADEUS Systems
**
-** Copyright (2006) The source forge armadeus project team
+** Copyright (C) 2011 year The source forge armadeus systems team
**
** 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
@@ -17,23 +17,37 @@
** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
-** ApfNetworkDefs.h
+** File : tfp410ctrl.h
**
-** author: ca...@us...
+** authors: th...@us...
*/
+
+// I2C slave Adresses
-#ifndef __APFNETWORKDEFS_H_INCLUDED__
-#define __APFNETWORKDEFS_H_INCLUDED__
+#define TFP410_I2C_SLAVE_ADDR 0x38
+
+
+// main registers address
+#define VEN_ID 0x014C
+#define DEV_ID 0x410
+#define REV_ID 0x0000
+
+
+#define VEN_ID_REG 0x00
+#define DEV_ID_REG 0x02
+#define REV_ID_REG 0x04
+#define CTL_1_MODE_REG 0x08
+#define CTL_2_MODE_REG 0x09
+#define CTL_3_MODE_REG 0x0A
+#define CFG_REG 0x0B
+#define DE_DLY_REG 0x32
+#define DE_CTL_REG 0x33
+#define DE_TOP_REG 0x34
+#define DE_CNT_REG 0x36
+#define DE_LIN_REG 0x38
+#define H_RES_REG 0x3A
+#define V_RES_REG 0x3C
-namespace ApfNetworkDefs
-{
- // The Dynamic and/or Private Ports are those from 49152 through 65535
- static const unsigned int APF_SOCKET = 50154; //why not ?
- static const unsigned int DATASTREAM_RELEASE = 5;
- static const int MIN_DAC = 0;
- static const int MAX_DAC = 32;
-}
-#endif // __APFNETWORKDEFS_H_INCLUDED__
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2011-02-15 15:13:16
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0aa57e2a8f7c19bcde241b840a537b7673aece20 (commit)
from 811470e8c8ed8033e119b8d66362f0347ce62c6e (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 0aa57e2a8f7c19bcde241b840a537b7673aece20
Author: Nicolas Colombain <nic...@ar...>
Date: Tue Feb 15 16:12:52 2011 +0100
[LINUX] change LW700 clock polarity on APF51dev
-----------------------------------------------------------------------
Summary of changes:
.../408-armadeus-add_apf51-dev_baseboard.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index 57d93e9..b1ea74b 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -219,7 +219,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ .left_margin = 96, .right_margin = 96,
+ .upper_margin = 0x14, .lower_margin = 0x15,
+ .hsync_len = 64, .vsync_len = 4,
-+ .sync = FB_SYNC_CLK_IDLE_EN | FB_SYNC_CLK_LAT_FALL,
++ .sync = FB_SYNC_CLK_IDLE_EN,
+ .vmode = FB_VMODE_NONINTERLACED,
+ .flag = 0,
+ },
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2011-02-15 15:07:11
|
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 811470e8c8ed8033e119b8d66362f0347ce62c6e (commit)
from fd74c67fda029938d9bd4a0341a5226365f30db0 (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 811470e8c8ed8033e119b8d66362f0347ce62c6e
Author: Nicolas Colombain <nic...@ar...>
Date: Tue Feb 15 16:06:47 2011 +0100
[LINUX] change APF51Dev LW700 clock polarity
-----------------------------------------------------------------------
Summary of changes:
.../408b-armadeus-add_apf51-proto_baseboard.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
index 7c37539..eef915a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
@@ -132,7 +132,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51proto-baseboard.c
+ .left_margin = 96, .right_margin = 96,
+ .upper_margin = 0x14, .lower_margin = 0x15,
+ .hsync_len = 64, .vsync_len = 4,
-+ .sync = FB_SYNC_CLK_IDLE_EN | FB_SYNC_CLK_LAT_FALL,
++ .sync = FB_SYNC_CLK_IDLE_EN,
+ .vmode = FB_VMODE_NONINTERLACED,
+ .flag = 0,
+ },
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-02-09 09:49:18
|
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 013cc3e204fb97667dc9ef0c563599743e537dd0 (commit)
via 9eafdf7dfa61fd96fcbb2ce6eb5fb194ec2bcb78 (commit)
from 532662d1142719b90f7ccd1c381e4b7015d8e6a4 (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 013cc3e204fb97667dc9ef0c563599743e537dd0
Merge: 9eafdf7dfa61fd96fcbb2ce6eb5fb194ec2bcb78 532662d1142719b90f7ccd1c381e4b7015d8e6a4
Author: Fabien Marteau <fab...@ar...>
Date: Wed Feb 9 10:48:50 2011 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 9eafdf7dfa61fd96fcbb2ce6eb5fb194ec2bcb78
Author: Fabien Marteau <fab...@ar...>
Date: Wed Feb 9 10:48:19 2011 +0100
[buildroot][kernel] Update config files for buildroot 2010.11 and kernel 2.6.38-rc3
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 12 +++++-------
.../armadeus/apf51/apf51-linux-2.6.38.config | 16 +++++++++++++++-
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 1a1bdce..f45af9e 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,9 +1,9 @@
#
# Automatically generated make config: don't edit
-# Thu Feb 3 14:38:43 2011
+# Buildroot version: 2010.11-00288-g974fb11-dirty
+# Tue Feb 8 18:54:12 2011
#
BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2010.11-git"
BR2_arm=y
# BR2_armeb is not set
# BR2_avr32 is not set
@@ -134,11 +134,6 @@ BR2_OPTIMIZE_S=y
# BR2_HAVE_DEVFILES is not set
#
-# Advanced
-#
-BR2_CONFIG_CACHE=y
-
-#
# Toolchain
#
BR2_TOOLCHAIN_BUILDROOT=y
@@ -592,6 +587,7 @@ BR2_PACKAGE_ZLIB=y
# BR2_PACKAGE_FREETYPE is not set
# BR2_PACKAGE_JPEG is not set
# BR2_PACKAGE_LIBART is not set
+# BR2_PACKAGE_GDK_PIXBUF is not set
# BR2_PACKAGE_LIBPNG is not set
# BR2_PACKAGE_LIBSVGTINY is not set
# BR2_PACKAGE_LIBUNGIF is not set
@@ -786,6 +782,8 @@ BR2_PACKAGE_NANO=y
#
BR2_ROOTFS_POST_BUILD_SCRIPT=""
BR2_ROOTFS_DEVICE_TABLE="target/device/armadeus/rootfs/device_table.txt"
+BR2_ROOTFS_SKELETON_DEFAULT=y
+# BR2_ROOTFS_SKELETON_CUSTOM is not set
# BR2_TARGET_ROOTFS_CRAMFS is not set
# BR2_TARGET_ROOTFS_CLOOP is not set
# BR2_TARGET_ROOTFS_EXT2 is not set
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index 61b5e1f..769dc4f 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.38-rc3 Kernel Configuration
-# Thu Feb 3 22:16:23 2011
+# Wed Feb 9 10:02:33 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -984,6 +984,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_QT602240 is not set
# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+# CONFIG_TOUCHSCREEN_TSC2102 is not set
CONFIG_TOUCHSCREEN_WM831X=m
# CONFIG_TOUCHSCREEN_WM97XX is not set
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
@@ -1115,6 +1116,7 @@ CONFIG_SPI_IMX=y
#
CONFIG_SPI_SPIDEV=m
# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_TSC2102 is not set
#
# PPS support
@@ -1187,6 +1189,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_AD7414 is not set
# CONFIG_SENSORS_AD7418 is not set
# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_AS1531 is not set
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
@@ -1400,6 +1403,7 @@ CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_LOGO_ARMADEUS_CLUT224=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -1641,6 +1645,16 @@ CONFIG_USB_OTG_UTILS=y
# CONFIG_USB_GPIO_VBUS is not set
CONFIG_USB_ULPI=y
# CONFIG_NOP_USB_XCEIV is not set
+
+#
+# Armadeus specific drivers
+#
+# CONFIG_ARMADEUS_DRIVERS is not set
+
+#
+# FPGA Drivers
+#
+# CONFIG_ARMADEUS_FPGA_DRIVERS is not set
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-02-08 21:28:38
|
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 532662d1142719b90f7ccd1c381e4b7015d8e6a4 (commit)
via f93797395b4bad52b2adb8c63b7949cd9ee41c42 (commit)
via f3e8d809dd06f79982a0b30efac59889d35a5cae (commit)
from 974fb11c2a59d4ce4ce9f9263a1d8f68ee62d0e2 (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 532662d1142719b90f7ccd1c381e4b7015d8e6a4
Merge: f93797395b4bad52b2adb8c63b7949cd9ee41c42 974fb11c2a59d4ce4ce9f9263a1d8f68ee62d0e2
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 8 22:27:39 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
Conflicts:
buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
commit f93797395b4bad52b2adb8c63b7949cd9ee41c42
Author: Julien Boibessot <jul...@ar...>
Date: Tue Feb 8 21:53:41 2011 +0100
[LINUX] 2.6.38: Now LCD type can be fully passed as boot parameters (tested on APF27)
commit f3e8d809dd06f79982a0b30efac59889d35a5cae
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 7 19:32:45 2011 +0100
[LINUX] 2.6.29 patches cleanup
-----------------------------------------------------------------------
Summary of changes:
...093-armadeus-add_ssi_registers_definition.patch | 16 --
...352-armadeus-time-fix_timekeeping_resume.patch} | 0
.../2.6.38/021-armadeus-apf9328.patch | 124 ++++++------
.../2.6.38/023-armadeus-fblcd-kconfig.patch | 83 --------
.../2.6.38/281-apf27-armadeus-add_apf27.c.patch | 198 +++++++-------------
5 files changed, 131 insertions(+), 290 deletions(-)
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/093-armadeus-add_ssi_registers_definition.patch
rename buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/{352-armadeus-timekeeping.patch => 352-armadeus-time-fix_timekeeping_resume.patch} (100%)
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/023-armadeus-fblcd-kconfig.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/093-armadeus-add_ssi_registers_definition.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/093-armadeus-add_ssi_registers_definition.patch
deleted file mode 100644
index 7671a09..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/093-armadeus-add_ssi_registers_definition.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- linux-org/arch/arm/mach-imx/include/mach/imx-regs.h 2008-07-18 18:51:40.000000000 +0200
-+++ linux/arch/arm/mach-imx/include/mach/imx-regs.h 2008-07-18 09:55:17.000000000 +0200
-@@ -316,11 +316,12 @@
- #define RTOR(x) __REG2( IMX_DMAC_BASE + 0x98, (x) << 6) /* Request timeout Registers */
- #define BUCR(x) __REG2( IMX_DMAC_BASE + 0x98, (x) << 6) /* Bus Utilization Registers */
-
-+#define MAX_DMA_CNTR (0xffffff)
- #define DCR_DRST (1<<1)
- #define DCR_DEN (1<<0)
- #define DBTOCR_EN (1<<15)
- #define DBTOCR_CNT(x) ((x) & 0x7fff )
--#define CNTR_CNT(x) ((x) & 0xffffff )
-+#define CNTR_CNT(x) ((x) & MAX_DMA_CNTR )
- #define CCR_DMOD_LINEAR ( 0x0 << 12 )
- #define CCR_DMOD_2D ( 0x1 << 12 )
- #define CCR_DMOD_FIFO ( 0x2 << 12 )
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-time-fix_timekeeping_resume.patch
similarity index 100%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-timekeeping.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/352-armadeus-time-fix_timekeeping_resume.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
index 02a964c..4a2164d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c 2011-02-07 09:30:20.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c 2011-02-08 19:33:09.000000000 +0100
@@ -0,0 +1,587 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
@@ -593,7 +593,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h 2011-02-07 11:01:05.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h 2011-02-08 21:42:50.000000000 +0100
@@ -0,0 +1,329 @@
+/*
+ *
@@ -642,9 +642,14 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
+
+#ifdef CONFIG_MACH_APF9328
+static int apf9328_fb_init(struct platform_device *pdev);
-+static void apf9328_fb_exit(struct platform_device *pdev);
+#endif
+
++char lcd_name[32];
++void apf_set_lcd_name(const char *name) {
++ printk(KERN_DEBUG "--- Setting LCD name to (%s)\n", name);
++ strlcpy(lcd_name, name, sizeof(lcd_name));
++}
++
+/*
+ * Power on/off LCD's internal logic
+ */
@@ -652,46 +657,47 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
+{
+ u32 isr;
+
-+ printk(KERN_DEBUG "%s: %s\n", __func__, on ? "on":"off");
++ printk(KERN_DEBUG "%s: %s, %s\n", __func__, on ? "on":"off", lcd_name);
+ isr = 0;
-+#ifdef CONFIG_FB_IMX_OPTREX_F51900_CSTN
-+ if (on)
-+ gpio_set_value(OPTREX_F51900_POWER_DOWN, 1);
-+ else
-+ gpio_set_value(OPTREX_F51900_POWER_DOWN, 0);
-+#elif defined(CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT)
-+ /* No LCD powerdown yet */
-+#elif defined(CONFIG_FB_IMX_SHARP_LQ043_TFT)
-+ if (on) {
-+ mdelay(200); /* at least ten frames have to be processed before
-+ enabling the display */
-+ /* Waits end of current frame */
-+ isr = readl(MXC_IO_ADDRESS(LCDC_BASE_ADDR) + 0x40);
-+ printk("isr %08x\n", isr);
-+ do {
++
++ if (!strcmp("Optrex-FS1900", lcd_name)) {
++ if (on)
++ gpio_set_value(OPTREX_F51900_POWER_DOWN, 1);
++ else
++ gpio_set_value(OPTREX_F51900_POWER_DOWN, 0);
++ } else if (!strcmp("Microtips-T035", lcd_name)) {
++ /* No LCD powerdown yet */
++ } else if (!strcmp("Sharp-LQ043", lcd_name)) {
++ if (on) {
++ mdelay(200); /* at least ten frames have to be processed before
++ enabling the display */
++ /* Waits end of current frame */
+ isr = readl(MXC_IO_ADDRESS(LCDC_BASE_ADDR) + 0x40);
+ printk("isr %08x\n", isr);
-+ udelay(1000);
-+ pr_debug("%08x\n", isr);
-+ } while ((isr & LCDISR_EOF) == 0);
-+
-+ gpio_set_value(SHARP_LQ043_POWER_DOWN, 1);
-+ mdelay(200);
++ do {
++ isr = readl(MXC_IO_ADDRESS(LCDC_BASE_ADDR) + 0x40);
++ pr_debug("isr %08x\n", isr);
++ udelay(1000);
++ pr_debug("%08x\n", isr);
++ } while ((isr & LCDISR_EOF) == 0);
++
++ gpio_set_value(SHARP_LQ043_POWER_DOWN, 1);
++ mdelay(200);
++ } else {
++ gpio_set_value(SHARP_LQ043_POWER_DOWN, 0);
++ mdelay(200); /* needs to wait 10 frames after DISP goes down
++ before shutting down LCDC (done in imxfb) */
++ }
++ } else if (!strcmp("Chimei-LW700AT9003", lcd_name)) {
++ /* No LCD powerdown yet */
+ } else {
-+ gpio_set_value(SHARP_LQ043_POWER_DOWN, 0);
-+ mdelay(200); /* needs to wait 10 frames after DISP goes down
-+ before shutting down LCDC (done in imxfb) */
++ /* All other cases: use CONTRAST as PWDN */
++ if (on) {
++ gpio_set_value(CONTRAST_LINE, 0);
++ } else {
++ gpio_set_value(CONTRAST_LINE, 1);
++ }
+ }
-+#elif defined(CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT)
-+ /* No LCD powerdown yet */
-+#else
-+ /* All other cases: use CONTRAST as PWDN */
-+ if (on) {
-+ gpio_set_value(CONTRAST_LINE, 0);
-+ } else {
-+ gpio_set_value(CONTRAST_LINE, 1);
-+ }
-+#endif
+}
+
+/*
@@ -815,30 +821,28 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
+ .dmacr = DEFAULT_DMA_SETTINGS,
+ .lcd_power = apf_lcd_power,
+ .backlight_power= apf_lcd_backlight_power,
-+#ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
-+ .pwmr = 0x000003ff, /* Contrast with PWM @ Pixel clock / 256, max width by default */
-+#elif defined(CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT)
-+ .pwmr = 0x00000150, /* Contrast with PWM @ Line Pulse / 256, medium width by default */
-+#elif defined(CONFIG_FB_IMX_SHARP_LQ057_TFT)
-+ .pwmr = 0, /* No contrast management */
-+#elif defined(CONFIG_FB_IMX_OPTREX_F51900_CSTN)
-+ .pwmr = 0, /* No contrast management */
-+#elif defined(CONFIG_FB_IMX_MOTOROLA_A910_TFT)
-+ .pwmr = 0, /* No contrast management */
-+#elif defined(CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT)
-+ .pwmr = 0x00a903ff, /* Contrast with PWM @ Pixel clock / 256, max width by default */
-+#else
-+#error Please define a imx_fb_platform_data structure with your LCD parameters
-+#endif
+#ifdef CONFIG_MACH_APF9328
-+ .init = apf9328_fb_init,
-+ .exit = apf9328_fb_exit,
++ .init = apf9328_fb_init,
+#elif CONFIG_MACH_APF27
+ .init = apf27_fb_init,
-+ .exit = apf27_fb_exit,
+#endif
+};
+
++void apf_fb_set_default_contrast(void /*char *name*/)
++{
++ if (!strcmp("Optrex-FS1900", lcd_name)) {
++ apf_fb_data.pwmr = 0; /* No contrast management */
++ } else if (!strcmp("Microtips-T035", lcd_name)) {
++ apf_fb_data.pwmr = 0x00000150; /* Contrast with PWM @ Line Pulse / 256, medium width by default */
++ } else if (!strcmp("Sharp-LQ043", lcd_name)) {
++ apf_fb_data.pwmr = 0x000003ff; /* Contrast with PWM @ Pixel clock / 256, max width by default */
++ } else if (!strcmp("Chimei-LW700AT9003", lcd_name)) {
++ apf_fb_data.pwmr = 0x00a903ff; /* Contrast with PWM @ Pixel clock / 256, max width by default */
++ } else {
++ apf_fb_data.pwmr = 0; /* No contrast management */
++ }
++}
++
+/*
+ * Configure all GPIOs needed by LCDs
+ */
@@ -911,10 +915,6 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
+ return 0;
+}
+
-+static void apf9328_fb_exit(struct platform_device *pdev)
-+{
-+ /* TO BE DONE */
-+}
+static void apf9328_init_lcd(void)
+{
+ mxc_register_device(&mxc_fb_device, &apf_fb_data);
@@ -927,7 +927,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h 2011-02-07 09:30:20.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h 2011-02-08 19:33:09.000000000 +0100
@@ -0,0 +1,71 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
@@ -1003,7 +1003,7 @@ Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c 2011-02-07 09:30:20.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c 2011-02-08 19:33:09.000000000 +0100
@@ -0,0 +1,325 @@
+/*
+ * apf9328-dev.c
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/023-armadeus-fblcd-kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/023-armadeus-fblcd-kconfig.patch
deleted file mode 100644
index 9abc9db..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/023-armadeus-fblcd-kconfig.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/drivers/video/Kconfig 2010-10-20 22:30:22.000000000 +0200
-+++ b/drivers/video/Kconfig 2010-12-16 12:46:56.000000000 +0100
-@@ -410,6 +410,80 @@
- select FB_CFB_COPYAREA
- select FB_CFB_IMAGEBLIT
-
-+choice
-+ depends on FB_IMX || FB_MXC
-+ prompt "LCD Panel"
-+ default FB_IMX_SHARP_LQ043_TFT
-+
-+# Please order LCDs by constructor alphabetical order !
-+
-+config FB_IMX_CHIMEI_LW700AT9003_TFT
-+ bool "Chimei LW700AT9003"
-+ depends on MACH_APF27
-+ help
-+ Chimei LW700AT9003, a 7" 18 bits, TFT panel.
-+ The native resolution is 800x600.
-+
-+config FB_IMX_HITACHI_TX12D17VM1BDP_TFT
-+ bool "Hitachi TX12D17VM1BDP"
-+ depends on MACH_APF27
-+ help
-+ HITACHI_TX12D17VM1BDP, a 5.7" 18 bits, TFT panel.
-+ The native resolution is 640x480.
-+
-+config FB_IMX_MICROTIPS_MTF_T035_TFT
-+ bool "Microtips MTF-T035"
-+ depends on MACH_APF9328
-+ help
-+ Microtips MTF-T035, a 3.5" 24 bits color 320x240, TFT panel.
-+ The native resolution is 320x240.
-+
-+config FB_IMX_MOTOROLA_A910_TFT
-+ bool "Motorola A910 TFT"
-+ depends on MACH_APF9328
-+ help
-+ Motorola A910 screen, a 1.2" color QVGA, TFT panel.
-+ The native resolution is 240x320.
-+
-+config FB_IMX_OPTREX_F51900_CSTN
-+ bool "Optrex F-51900"
-+ depends on MACH_APF9328
-+ help
-+ Optrex 5.7" 8 bits color STN.
-+ The native resolution is 320x240.
-+
-+config FB_IMX_OPTREX_T51638D084_TFT
-+ bool "Optrex T51638D084"
-+ depends on MACH_APF27
-+ help
-+ OPTREX_T51638D084, a 8.4" 18 bits, TFT panel.
-+ The native resolution is 640x480.
-+
-+config FB_IMX_SHARP_LQ043_TFT
-+ bool "Sharp LQ043"
-+ help
-+ Sharp LQ043, a 4.3" 24 bits color 480x272, TFT panel.
-+ The native resolution is 480x272.
-+
-+config FB_IMX_SHARP_LQ057_TFT
-+ bool "Sharp LQ057"
-+ help
-+ Sharp LQ057, a 3.5" 18 bits color QVGA, TFT panel.
-+ The native resolution is 320x240.
-+
-+# Please let the following entry always in last position:
-+config FB_IMX_CUSTOM_LCD
-+ bool "Custom LCD"
-+ depends on MACH_APF27
-+ help
-+ Freely hackable LCD. Modify its parameters directly in
-+ drivers/video/mxc/mxcfb_modedb.c.
-+
-+# Please let these
-+# two lines here
-+
-+endchoice
-+
- config FB_CYBER2000
- tristate "CyberPro 2000/2010/5000 support"
- depends on FB && PCI && (BROKEN || !SPARC64)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
index 3622735..7d93a8c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
@@ -154,8 +154,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+
+ int rc = phy_read(phydev, LAN87xx_SPECIAL_REG);
+
-+ phy_write(phydev,LAN87xx_SPECIAL_REG, rc | 0xE0);
-+ phy_write(phydev,MII_BMCR, BMCR_RESET);
++ phy_write(phydev, LAN87xx_SPECIAL_REG, rc | 0xE0);
++ phy_write(phydev, MII_BMCR, BMCR_RESET);
+ udelay(1000);
+ return 0;
+}
@@ -693,7 +693,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ /* APF27 has an onboard Ethernet PHY */
+#ifdef CONFIG_FEC
+ /* bring lan8700 out of power down mode */
-+ phy_register_fixup_for_id("1:1f", lan8700_wakeup );
++ phy_register_fixup_for_id("1:1f", lan8700_wakeup);
+ imx27_add_fec(NULL);
+#endif
+
@@ -760,8 +760,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c 2011-02-07 16:56:02.000000000 +0100
-@@ -0,0 +1,935 @@
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c 2011-02-08 09:46:00.000000000 +0100
+@@ -0,0 +1,933 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -1630,10 +1630,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
+
+ imx27_add_imx_ssi(0, &apf27_ssi0_pdata);
+
-+#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
+ /* APF27Dev has an LCD connector */
+ apf27_lcd_init();
-+#endif
+
+ apf27dev_pwr_ctrl_gpio_active();
+
@@ -1700,14 +1698,14 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c 2011-02-07 16:56:02.000000000 +0100
-@@ -0,0 +1,226 @@
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c 2011-02-08 17:38:31.000000000 +0100
+@@ -0,0 +1,168 @@
+/*
+ * apf27-lcd.c
+ *
+ * Handle support of multiple LCDs on the APF27Dev
+ *
-+ * Copyright (C) 2009 Armadeus Systems
++ * Copyright (C) 2009-2011 Armadeus Systems
+ * Authors: Julien Boibessot <jul...@ar...>
+ * Nicolas Colombain <nic...@ar...>
+ *
@@ -1739,58 +1737,36 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
+
+#include "devices-imx27.h"
+
-+#ifdef CONFIG_IMX_BACKLIGHT_MODULE
-+#define CONFIG_IMX_BACKLIGHT
-+#endif
-+
-+#ifdef CONFIG_FB_IMX_OPTREX_T51638D084_TFT
-+# define LCD_NAME "Optrex-T51638D084"
-+/* PS is used as LCD Display ON/OFF */
-+# define LCD_USES_PS_AS_GPIO
-+/* activates LCD at startup */
-+# define LCD_POWER_GPIO (GPIO_PORTA | 26)
-+# define LCD_POWER_ON (1)
-+#endif
++static int apf27_fb_init(struct platform_device*);
+
-+#ifdef CONFIG_FB_IMX_SHARP_LQ057_TFT
-+# define LCD_NAME "Sharp-LQ057"
-+/* CONTRAST is used as backlight's ON/OFF */
-+# define LCD_USES_CONTRAST_AS_GPIO
-+/* activates backlight at startup */
-+# define LCD_BACKLIGHT_GPIO (GPIO_PORTA | 30)
-+# define LCD_BACKLIGHT_ON (0)
-+#endif
-+
-+#ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
-+# define LCD_NAME "Sharp-LQ043"
-+/* OE_ACD is used as LCD Display ON/OFF */
-+# define LCD_USES_OE_ACD_AS_GPIO
-+/* activates LCD at startup */
-+# define LCD_POWER_GPIO (GPIO_PORTA | 31)
-+# define LCD_POWER_ON (1)
-+#endif
-+
-+#ifdef CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT
-+# define LCD_NAME "Chimei-LW700AT9003"
-+#endif
-+
-+#ifdef CONFIG_FB_IMX_HITACHI_TX12D17VM1BDP_TFT
-+# define LCD_NAME "Hitachi-TX12D17VM1BDP"
-+#endif
-+
-+/* Please always let the custom LCD in this (last) position: */
-+#ifdef CONFIG_FB_IMX_CUSTOM_LCD
-+# define LCD_NAME "Custom" /* Clone of LQ043 by default */
-+/* OE_ACD is used as LCD Display ON/OFF */
-+# define LCD_USES_OE_ACD_AS_GPIO
-+/* activates LCD at startup */
-+# define LCD_POWER_GPIO (GPIO_PORTA | 31)
-+# define LCD_POWER_ON (1)
-+#endif
++static void apf_lcd_custom_init(const char *name)
++{
++ if (!name)
++ return;
++
++ if (!strcmp("Optrex-T51638D084", name)) {
++ /* Activates LCD at startup: PS is used as LCD Display ON/OFF */
++ gpio_set_value((GPIO_PORTA | 26), 1);
++ mxc_gpio_mode(GPIO_PORTA | 26 | GPIO_OUT | GPIO_GPIO);
++ } else if (!strcmp("Sharp-LQ057", name)) {
++ /* Activates backlight at startup: CONTRAST is used as backlight's ON/OFF */
++ gpio_set_value((GPIO_PORTA | 30), 0);
++ mxc_gpio_mode(GPIO_PORTA | 30 | GPIO_OUT | GPIO_GPIO);
++ } else if (!strcmp("Sharp-LQ043", name)) {
++ /* Activates LCD at startup: OE_ACD is used as LCD Display ON/OFF */
++ gpio_set_value((GPIO_PORTA | 31), 1);
++ mxc_gpio_mode(GPIO_PORTA | 31 | GPIO_OUT | GPIO_GPIO);
++ } else if (!strcmp("Custom", name)) {
++ /* Please always let the custom LCD in this (last) position: */
++ ;
++ } else {
++ /* "Chimei-LW700AT9003" / "Hitachi-TX12D17VM1BDP" */
++ ;
++ }
+/* Please let these 2 lines here
+*/
++}
+
-+#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
+static int mxc_lcd_pins[] = {
+ PA5_PF_LSCLK,
+ PA6_PF_LD0,
@@ -1813,95 +1789,40 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
+ PA23_PF_LD17,
+ PA24_PF_REV,
+ PA25_PF_CLS,
-+#ifdef LCD_USES_PS_AS_GPIO
-+ (GPIO_PORTA | 26 | GPIO_OUT | GPIO_GPIO),
-+#else
+ PA26_PF_PS,
-+#endif
+ PA27_PF_SPL_SPR,
+ PA28_PF_HSYNC,
+ PA29_PF_VSYNC,
-+#ifdef LCD_USES_CONTRAST_AS_GPIO
-+ (GPIO_PORTA | 30 | GPIO_OUT | GPIO_GPIO),
-+#else
+ PA30_PF_CONTRAST,
-+#endif
-+#ifdef LCD_USES_OE_ACD_AS_GPIO
-+ (GPIO_PORTA | 31 | GPIO_OUT | GPIO_GPIO)
-+#else
+ PA31_PF_OE_ACD
-+#endif
+};
+
-+static int apf27_fb_init(struct platform_device *pdev)
-+{
-+#ifdef CONFIG_FB_MXC
-+# ifdef LCD_POWER_GPIO
-+ /* activates LCD power at startup */
-+ gpio_set_value(LCD_POWER_GPIO, LCD_POWER_ON);
-+# endif
-+# ifdef LCD_BACKLIGHT_GPIO
-+ /* activates backlight at startup */
-+ gpio_set_value(LCD_BACKLIGHT_GPIO, LCD_BACKLIGHT_ON);
-+# endif
-+#endif
-+
-+ return mxc_gpio_setup_multiple_pins(mxc_lcd_pins, ARRAY_SIZE(mxc_lcd_pins), "LCD");
-+}
-+
-+#ifdef CONFIG_FB_MXC
-+static int
-+#else
-+static void
-+#endif
-+apf27_fb_exit(struct platform_device *pdev)
-+{
-+ mxc_gpio_release_multiple_pins(mxc_lcd_pins, ARRAY_SIZE(mxc_lcd_pins));
-+
-+#ifdef CONFIG_FB_MXC
-+ return 0;
-+#endif
-+}
-+
+/* Freescale driver */
+#ifdef CONFIG_FB_MXC
+static struct mxc_fb_platform_data apf_fb_data = {
+ .mode = LCD_NAME,
+ .init = apf27_fb_init,
-+ .exit = apf27_fb_exit,
+};
+/* Mainline driver */
+#elif CONFIG_FB_IMX
+#include "../mach-imx/apf9328_lcd_config.h"
+#endif
+
-+# ifdef CONFIG_IMX_BACKLIGHT
-+static struct imxbl_machinfo imx_bl_machinfo = {
-+ .max_intensity = 0xff,
-+ .default_intensity = 0x90,
-+ .limit_mask = 0x7f, /* when battery is low */
-+ /* set_bl_intensity = put a function here if you want to overload default one, */
-+};
-+
-+static struct platform_device imxbl_device = {
-+ .name = "imx-bl",
-+ .dev = {
-+ /* .parent = &imxfb_device.dev, crash kernel even if EXPORT_SYMBOL() is done in generic.c */
-+ .platform_data = &imx_bl_machinfo,
-+ },
-+ .id = 0,
-+};
-+# endif /* CONFIG_IMX_BACKLIGHT */
++static int apf27_fb_init(struct platform_device *pdev)
++{
++ int ret;
+
-+#endif /* CONFIG_FB_MXC || CONFIG_FB_IMX */
++ ret = mxc_gpio_setup_multiple_pins(mxc_lcd_pins,
++ ARRAY_SIZE(mxc_lcd_pins), "LCD");
++ if (ret)
++ return ret;
+
++ apf_lcd_custom_init(lcd_name);
+
-+#ifdef CONFIG_IMX_BACKLIGHT
-+static struct platform_device *platform_devices[] __initdata = {
-+ &imxbl_device,
-+};
-+#endif
++ return 0;
++}
+
++#ifdef CONFIG_FB_MXC
+void apf27_lcd_startup(void)
+{
+ int i;
@@ -1917,15 +1838,34 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
+ /* wait a few milli */
+ mdelay(100);
+}
++#endif
+
+void apf27_lcd_init(void)
+{
-+#ifdef CONFIG_IMX_BACKLIGHT
-+ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
++ char *opt, *name = NULL, *options = NULL;
++
++ if (fb_get_options("imxfb", &options))
++ goto end;
++
++ if (!options || !*options)
++ goto end;
++
++ while ((opt = strsep(&options, ",")) != NULL) {
++ if (!*opt)
++ continue;
++ else
++ name = opt;
++ }
++
++#ifdef CONFIG_FB_MXC
++ apf27_lcd_startup();
+#endif
-+#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
++ apf_set_lcd_name(name);
++ apf_fb_set_default_contrast();
++
+ imx27_add_imx_fb(&apf_fb_data);
-+#endif
++end:
++ return;
+}
+
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c
@@ -2126,7 +2066,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c
Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-01 04:05:49.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-07 17:05:16.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-08 18:23:26.000000000 +0100
@@ -83,6 +83,7 @@
case MACH_TYPE_MX21ADS:
case MACH_TYPE_PCA100:
hooks/post-receive
--
armadeus
|
|
From: Nicolas <th...@us...> - 2011-02-08 15:03:04
|
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 974fb11c2a59d4ce4ce9f9263a1d8f68ee62d0e2 (commit)
from ef508c9ec1374d8d2f5da8fda873298616fe1a7e (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 974fb11c2a59d4ce4ce9f9263a1d8f68ee62d0e2
Author: Nicolas Colombain <nic...@ar...>
Date: Tue Feb 8 16:02:34 2011 +0100
[LINUX] add IPU clock polarity support for iMX51
-----------------------------------------------------------------------
Summary of changes:
.../408-armadeus-add_apf51-dev_baseboard.patch | 2 +-
.../408b-armadeus-add_apf51-proto_baseboard.patch | 2 +-
...deus-mx5fb-add_ipu_clock_polarity_support.patch | 25 ++++++++++++++++++++
3 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/419-armadeus-mx5fb-add_ipu_clock_polarity_support.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index 9e2c3d7..5a6a3ce 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -193,7 +193,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51dev-baseboard.c
+ .left_margin = 96, .right_margin = 96,
+ .upper_margin = 0x14, .lower_margin = 0x15,
+ .hsync_len = 64, .vsync_len = 4,
-+ .sync = FB_SYNC_CLK_IDLE_EN,
++ .sync = FB_SYNC_CLK_IDLE_EN | FB_SYNC_CLK_LAT_FALL,
+ .vmode = FB_VMODE_NONINTERLACED,
+ .flag = 0,
+ },
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
index 23cd60a..3122ead 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408b-armadeus-add_apf51-proto_baseboard.patch
@@ -127,7 +127,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-mx5/apf51proto-baseboard.c
+ .left_margin = 96, .right_margin = 96,
+ .upper_margin = 0x14, .lower_margin = 0x15,
+ .hsync_len = 64, .vsync_len = 4,
-+ .sync = FB_SYNC_CLK_IDLE_EN,
++ .sync = FB_SYNC_CLK_IDLE_EN | FB_SYNC_CLK_LAT_FALL,
+ .vmode = FB_VMODE_NONINTERLACED,
+ .flag = 0,
+ },
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/419-armadeus-mx5fb-add_ipu_clock_polarity_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/419-armadeus-mx5fb-add_ipu_clock_polarity_support.patch
new file mode 100644
index 0000000..d5e9854
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/419-armadeus-mx5fb-add_ipu_clock_polarity_support.patch
@@ -0,0 +1,25 @@
+Add clock polarity support for non interlaced mode to ipu.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
+Index: linux-2.6.38-rc3/drivers/mfd/imx-ipu-v3/ipu-di.c
+===================================================================
+--- linux-2.6.38-rc3.orig/drivers/mfd/imx-ipu-v3/ipu-di.orig 2011-02-08 14:49:41.000000000 +0100
++++ linux-2.6.38-rc3/drivers/mfd/imx-ipu-v3/ipu-di.c 2011-02-08 15:09:30.000000000 +0100
+@@ -113,6 +113,7 @@ enum di_sync_wave {
+ #define DI_DW_GEN_COMPONENT_SIZE_OFFSET 16
+
+ #define DI_GEN_DI_CLK_EXT (1 << 20)
++#define DI_GEN_DI_CLK_POL (1 << 17)
+ #define DI_GEN_POLARITY_1 (1 << 0)
+ #define DI_GEN_POLARITY_2 (1 << 1)
+ #define DI_GEN_POLARITY_3 (1 << 2)
+@@ -405,6 +406,8 @@ int ipu_di_init_sync_panel(struct ipu_di
+ di_gen |= DI_GEN_POLARITY_2;
+ if (sig->Vsync_pol)
+ di_gen |= DI_GEN_POLARITY_3;
++ if (sig->clk_pol)
++ di_gen |= DI_GEN_DI_CLK_POL;
+ }
+
+ ipu_di_write(di, di_gen, DI_GENERAL);
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-02-08 14: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 ef508c9ec1374d8d2f5da8fda873298616fe1a7e (commit)
from bc9bb3c8ab9a3e78d70fb7ae79096e07c42c1a62 (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 ef508c9ec1374d8d2f5da8fda873298616fe1a7e
Author: Fabien Marteau <fab...@ar...>
Date: Tue Feb 8 15:52:40 2011 +0100
[buildroot][package][mysql_client] Fix link bug
-----------------------------------------------------------------------
Summary of changes:
...061-mysql_client-reduce_installation_size.patch | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch b/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch
index 356a4fb..c6c0332 100644
--- a/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch
+++ b/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch
@@ -6,7 +6,7 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/mysql_client/Config.in
===================================================================
--- buildroot.orig/package/mysql_client/Config.in 2010-11-30 16:52:43.000000000 +0100
-+++ buildroot/package/mysql_client/Config.in 2011-02-08 14:22:08.000000000 +0100
++++ buildroot/package/mysql_client/Config.in 2011-02-08 14:30:03.000000000 +0100
@@ -8,3 +8,20 @@
comment "Mysql client requires a toolchain with C++ support enabled"
@@ -31,8 +31,8 @@ Index: buildroot/package/mysql_client/Config.in
Index: buildroot/package/mysql_client/mysql_client.mk
===================================================================
--- buildroot.orig/package/mysql_client/mysql_client.mk 2010-11-30 16:52:43.000000000 +0100
-+++ buildroot/package/mysql_client/mysql_client.mk 2011-02-08 14:29:06.000000000 +0100
-@@ -32,10 +32,25 @@
++++ buildroot/package/mysql_client/mysql_client.mk 2011-02-08 15:15:57.000000000 +0100
+@@ -32,10 +32,31 @@
--enable-thread-safe-client \
$(ENABLE_DEBUG)
@@ -42,6 +42,11 @@ Index: buildroot/package/mysql_client/mysql_client.mk
endef
-MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_REMOVE_TEST_PROGS
++define MYSQL_CLIENT_MOVE_BINARIES_IN_USRLIB
++ mv $(TARGET_DIR)/usr/lib/mysql/* $(TARGET_DIR)/usr/lib/
++ rm -r $(TARGET_DIR)/usr/lib/mysql
++endef
++
+define MYSQL_CLIENT_DELETE_USELESS_BINARIES_SHRINK
+ rm -rf $(TARGET_DIR)/usr/bin/mysql_client_test
+ rm -rf $(TARGET_DIR)/usr/bin/mysql_waitpid
@@ -55,6 +60,7 @@ Index: buildroot/package/mysql_client/mysql_client.mk
+endef
+
+MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_DELETE_USELESS_BINARIES
++MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_MOVE_BINARIES_IN_USRLIB
+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SHRINK),y)
+MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_DELETE_USELESS_BINARIES_SHRINK
+endif
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-02-08 13:35:49
|
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 bc9bb3c8ab9a3e78d70fb7ae79096e07c42c1a62 (commit)
from 6b9e1b806a923a9c0d9cffae863ecaef4becd7c4 (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 bc9bb3c8ab9a3e78d70fb7ae79096e07c42c1a62
Author: Fabien Marteau <fab...@ar...>
Date: Tue Feb 8 14:35:22 2011 +0100
[buildroot][package][mysql_client] Update post install hooks according to new BR
-----------------------------------------------------------------------
Summary of changes:
...061-mysql_client-reduce_installation_size.patch | 26 +++++++++++--------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch b/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch
index d6cacd9..356a4fb 100644
--- a/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch
+++ b/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch
@@ -5,8 +5,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/mysql_client/Config.in
===================================================================
---- buildroot.orig/package/mysql_client/Config.in 2011-01-03 14:00:29.000000000 +0100
-+++ buildroot/package/mysql_client/Config.in 2011-01-03 14:00:39.000000000 +0100
+--- buildroot.orig/package/mysql_client/Config.in 2010-11-30 16:52:43.000000000 +0100
++++ buildroot/package/mysql_client/Config.in 2011-02-08 14:22:08.000000000 +0100
@@ -8,3 +8,20 @@
comment "Mysql client requires a toolchain with C++ support enabled"
@@ -30,17 +30,19 @@ Index: buildroot/package/mysql_client/Config.in
+endif
Index: buildroot/package/mysql_client/mysql_client.mk
===================================================================
---- buildroot.orig/package/mysql_client/mysql_client.mk 2011-01-03 14:00:29.000000000 +0100
-+++ buildroot/package/mysql_client/mysql_client.mk 2011-01-03 14:02:16.000000000 +0100
-@@ -32,10 +32,20 @@
+--- buildroot.orig/package/mysql_client/mysql_client.mk 2010-11-30 16:52:43.000000000 +0100
++++ buildroot/package/mysql_client/mysql_client.mk 2011-02-08 14:29:06.000000000 +0100
+@@ -32,10 +32,25 @@
--enable-thread-safe-client \
$(ENABLE_DEBUG)
-define MYSQL_CLIENT_REMOVE_TEST_PROGS
-+$(MYSQL_CLIENT_HOOK_POST_INSTALL):
++define MYSQL_CLIENT_DELETE_USELESS_BINARIES
rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
--endef
-+ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SHRINK),y)
+ endef
+
+-MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_REMOVE_TEST_PROGS
++define MYSQL_CLIENT_DELETE_USELESS_BINARIES_SHRINK
+ rm -rf $(TARGET_DIR)/usr/bin/mysql_client_test
+ rm -rf $(TARGET_DIR)/usr/bin/mysql_waitpid
+ rm -rf $(TARGET_DIR)/usr/bin/myisampack
@@ -50,9 +52,11 @@ Index: buildroot/package/mysql_client/mysql_client.mk
+ rm -rf $(TARGET_DIR)/usr/bin/myisam_ftdump
+ rm -rf $(TARGET_DIR)/usr/bin/myisamlog
+ rm -rf $(TARGET_DIR)/usr/bin/my_print_defaults
-+endif
++endef
+
-
--MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_REMOVE_TEST_PROGS
++MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_DELETE_USELESS_BINARIES
++ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SHRINK),y)
++MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_DELETE_USELESS_BINARIES_SHRINK
++endif
$(eval $(call AUTOTARGETS,package,mysql_client))
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-02-08 10:09:16
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 6b9e1b806a923a9c0d9cffae863ecaef4becd7c4 (commit)
from 834968421832654a422c47112619137a18709c12 (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 6b9e1b806a923a9c0d9cffae863ecaef4becd7c4
Author: Fabien Marteau <fab...@ar...>
Date: Tue Feb 8 11:08:57 2011 +0100
[linux] Adding ADC as1531 drivers
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.38.config | 3 ++-
...363-armadeus-ADC-Adding_AS1531_adc_driver.patch | 0
2 files changed, 2 insertions(+), 1 deletions(-)
copy buildroot/target/device/armadeus/linux/kernel-patches/{2.6.29 => 2.6.38}/363-armadeus-ADC-Adding_AS1531_adc_driver.patch (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
index 4b68c48..13a810d 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.38-rc3 Kernel Configuration
-# Mon Feb 7 17:10:57 2011
+# Tue Feb 8 11:03:24 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1189,6 +1189,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_AD7414 is not set
# CONFIG_SENSORS_AD7418 is not set
# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_AS1531 is not set
# CONFIG_SENSORS_ADM1021 is not set
# CONFIG_SENSORS_ADM1025 is not set
# CONFIG_SENSORS_ADM1026 is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/363-armadeus-ADC-Adding_AS1531_adc_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/363-armadeus-ADC-Adding_AS1531_adc_driver.patch
similarity index 100%
copy from buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/363-armadeus-ADC-Adding_AS1531_adc_driver.patch
copy to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/363-armadeus-ADC-Adding_AS1531_adc_driver.patch
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-02-07 16:21:10
|
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 834968421832654a422c47112619137a18709c12 (commit)
via 214be2bb261e891ce090630b0af0ee6ab0e30ef9 (commit)
from cdce01dfd04a0667200cbc1156902934e4119a38 (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 834968421832654a422c47112619137a18709c12
Merge: 214be2bb261e891ce090630b0af0ee6ab0e30ef9 cdce01dfd04a0667200cbc1156902934e4119a38
Author: Fabien Marteau <fab...@ar...>
Date: Mon Feb 7 17:20:46 2011 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 214be2bb261e891ce090630b0af0ee6ab0e30ef9
Author: Fabien Marteau <fab...@ar...>
Date: Mon Feb 7 17:20:13 2011 +0100
[linux] Fix ethernet bug
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.38.config | 5 ++-
.../2.6.38/281-apf27-armadeus-add_apf27.c.patch | 29 +++++++++++++++-----
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
index bfb707e..4b68c48 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux/arm 2.6.38-rc3 Kernel Configuration
-# Mon Feb 7 09:38:43 2011
+# Mon Feb 7 17:10:57 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -250,6 +250,7 @@ CONFIG_ARCH_MXC=y
# CONFIG_GPIO_PCA953X is not set
# CONFIG_KEYBOARD_GPIO_POLLED is not set
CONFIG_IMX_HAVE_PLATFORM_FEC=y
+CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT=y
CONFIG_IMX_HAVE_PLATFORM_IMX_FB=y
CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
CONFIG_IMX_HAVE_PLATFORM_IMX_SSI=y
@@ -822,7 +823,7 @@ CONFIG_PHYLIB=y
# 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_SMSC_PHY=y
# CONFIG_BROADCOM_PHY is not set
# CONFIG_BCM63XX_PHY is not set
# CONFIG_ICPLUS_PHY is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
index 3a3dd84..3622735 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/281-apf27-armadeus-add_apf27.c.patch
@@ -2,6 +2,7 @@
Adds support for Armadeus Systems APF27 module (i.MX27 based), APF27Dev
companion baseboard and APW extension board.
+Signed-off-by: Fabien Marteau <fab...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Eric Jarrige <eri...@ar...>
@@ -9,8 +10,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c 2011-02-07 10:38:08.000000000 +0100
-@@ -0,0 +1,731 @@
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c 2011-02-07 17:09:41.000000000 +0100
+@@ -0,0 +1,745 @@
+ /*
+ * apf27.c
+ *
@@ -51,6 +52,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+#include <linux/usb/otg.h>
+#include <linux/usb/ulpi.h>
+#include <linux/fsl_devices.h>
++#include <linux/phy.h>
+
+#include <asm/mach/flash.h>
+#include <asm/io.h>
@@ -146,6 +148,18 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+ PC6_PF_I2C2_SCL,
+};
+
++int lan8700_wakeup(struct phy_device *phydev)
++{
++#define LAN87xx_SPECIAL_REG 0x12
++
++ int rc = phy_read(phydev, LAN87xx_SPECIAL_REG);
++
++ phy_write(phydev,LAN87xx_SPECIAL_REG, rc | 0xE0);
++ phy_write(phydev,MII_BMCR, BMCR_RESET);
++ udelay(1000);
++ return 0;
++}
++
+#ifdef CONFIG_PWM
+static int mxc_pwm0_pins[] = {
+ PE5_PF_PWM0
@@ -657,7 +671,6 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+};
+#endif /* CONFIG_MACH_APF27_FPGA */
+
-+
+static void __init apf27_init(void)
+{
+ int ret;
@@ -679,6 +692,8 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
+
+ /* APF27 has an onboard Ethernet PHY */
+#ifdef CONFIG_FEC
++ /* bring lan8700 out of power down mode */
++ phy_register_fixup_for_id("1:1f", lan8700_wakeup );
+ imx27_add_fec(NULL);
+#endif
+
@@ -745,7 +760,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27.c
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c 2011-02-07 10:56:14.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c 2011-02-07 16:56:02.000000000 +0100
@@ -0,0 +1,935 @@
+ /*
+ * apf27-dev.c
@@ -1685,7 +1700,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev.c
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c 2011-02-07 11:03:53.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c 2011-02-07 16:56:02.000000000 +0100
@@ -0,0 +1,226 @@
+/*
+ * apf27-lcd.c
@@ -1916,7 +1931,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-lcd.c
Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-02-07 09:30:21.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c 2011-02-07 16:56:02.000000000 +0100
@@ -0,0 +1,190 @@
+ /*
+ * apf27-dev-ext-apw.c
@@ -2111,7 +2126,7 @@ Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf27-dev-ext-apw.c
Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-01 04:05:49.000000000 +0100
-+++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-07 11:22:19.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-07 17:05:16.000000000 +0100
@@ -83,6 +83,7 @@
case MACH_TYPE_MX21ADS:
case MACH_TYPE_PCA100:
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-02-07 15:29: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 cdce01dfd04a0667200cbc1156902934e4119a38 (commit)
from caa6b4faaa9025d4540f33f7b82547efa5415acc (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 cdce01dfd04a0667200cbc1156902934e4119a38
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 7 16:28:31 2011 +0100
[BUILDROOT] 2010.11: Updates tslib to BR mainline's state of the art
-----------------------------------------------------------------------
Summary of changes:
...dd_patch_for_recent_kernels_compatibility.patch | 53 ----
.../2010.11/126-tslib-test_add_quit_button.patch | 54 -----
.../2010.11/143-tslib-enable_raw_module.patch | 39 +++
...44-tslib-bump_version_to_current_git_head.patch | 252 ++++++++++++++++++++
4 files changed, 291 insertions(+), 107 deletions(-)
delete mode 100644 patches/buildroot/2010.11/044-tslib-add_patch_for_recent_kernels_compatibility.patch
delete mode 100644 patches/buildroot/2010.11/126-tslib-test_add_quit_button.patch
create mode 100644 patches/buildroot/2010.11/143-tslib-enable_raw_module.patch
create mode 100644 patches/buildroot/2010.11/144-tslib-bump_version_to_current_git_head.patch
diff --git a/patches/buildroot/2010.11/044-tslib-add_patch_for_recent_kernels_compatibility.patch b/patches/buildroot/2010.11/044-tslib-add_patch_for_recent_kernels_compatibility.patch
deleted file mode 100644
index 05090f4..0000000
--- a/patches/buildroot/2010.11/044-tslib-add_patch_for_recent_kernels_compatibility.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: buildroot/package/tslib/tslib-1.0-zz-make_it_work_on_powerpc_and_recent_kernels.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/tslib/tslib-1.0-zz-make_it_work_on_powerpc_and_recent_kernels.patch 2010-06-17 18:01:06.000000000 +0200
-@@ -0,0 +1,48 @@
-+The bit / absbit is defined the same way as in kernel. {EV|ABS}_CNT is
-+only exported in recent kernels.
-+
-+Signed-off-by: Sebastian Siewior <seb...@br...>
-+
-+
-+--- tslib-1.0.org/plugins/input-raw.c 2008-11-18 11:38:02.000000000 +0100
-++++ tslib-1.0/plugins/input-raw.c 2008-11-18 11:44:10.000000000 +0100
-+@@ -44,23 +44,31 @@
-+ int using_syn;
-+ };
-+
-++#define BITS_PER_LONG (sizeof(long) * 8)
-++#ifndef EV_CNT
-++#define EV_CNT (EV_MAX+1)
-++#endif
-++#ifndef ABS_CNT
-++#define ABS_CNT (ABS_MAX+1)
-++#endif
-++
-+ static int check_fd(struct tslib_input *i)
-+ {
-+ struct tsdev *ts = i->module.dev;
-+ int version;
-+- u_int32_t bit;
-+- u_int32_t absbit;
-++ unsigned long bit[EV_CNT / BITS_PER_LONG + 1];
-++ unsigned long absbit[ABS_MAX / BITS_PER_LONG + 1];
-+
-+ if (! ((ioctl(ts->fd, EVIOCGVERSION, &version) >= 0) &&
-+ (version == EV_VERSION) &&
-+- (ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit) * 8), &bit) >= 0) &&
-+- (bit & (1 << EV_ABS)) &&
-+- (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit) * 8), &absbit) >= 0) &&
-+- (absbit & (1 << ABS_X)) &&
-+- (absbit & (1 << ABS_Y)) && (absbit & (1 << ABS_PRESSURE)))) {
-++ (ioctl(ts->fd, EVIOCGBIT(0, sizeof(bit)), bit) >= 0) &&
-++ (bit[0] & (1 << EV_ABS)) &&
-++ (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit)), absbit) >= 0) &&
-++ (absbit[0] & (1 << ABS_X)) &&
-++ (absbit[0] & (1 << ABS_Y)) && (absbit[0] & (1 << ABS_PRESSURE)))) {
-+ }
-+
-+- if (bit & (1 << EV_SYN))
-++ if (bit[0] & (1 << EV_SYN))
-+ i->using_syn = 1;
-+
-+ return 0;
diff --git a/patches/buildroot/2010.11/126-tslib-test_add_quit_button.patch b/patches/buildroot/2010.11/126-tslib-test_add_quit_button.patch
deleted file mode 100644
index 0988ff8..0000000
--- a/patches/buildroot/2010.11/126-tslib-test_add_quit_button.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Create a patch in buildroot tslib package to add a button "Quit" in the program ts_test
-
-Signed-off-by: Jérémie Scheer <jer...@ar...>
-
-Index: buildroot/package/tslib/tslib-add_quit_button_to_test.patch
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/tslib/tslib-add_quit_button_to_test.patch 2010-07-07 17:23:42.000000000 +0200
-@@ -0,0 +1,45 @@
-+--- tslib-1.0/tests/ts_test.c.orig 2010-07-07 17:02:50.000000000 +0200
-++++ tslib-1.0/tests/ts_test.c 2010-07-07 16:27:44.000000000 +0200
-+@@ -44,7 +44,7 @@ static int button_palette [6] =
-+ 1, 5, 0
-+ };
-+
-+-#define NR_BUTTONS 2
-++#define NR_BUTTONS 3
-+ static struct ts_button buttons [NR_BUTTONS];
-+
-+ static void sig(int sig)
-+@@ -152,13 +152,15 @@ int main()
-+
-+ /* Initialize buttons */
-+ memset (&buttons, 0, sizeof (buttons));
-+- buttons [0].w = buttons [1].w = xres / 4;
-+- buttons [0].h = buttons [1].h = 20;
-+- buttons [0].x = xres / 4 - buttons [0].w / 2;
-+- buttons [1].x = (3 * xres) / 4 - buttons [0].w / 2;
-+- buttons [0].y = buttons [1].y = 10;
-++ buttons [0].w = buttons [1].w = buttons[2].w = xres / 4;
-++ buttons [0].h = buttons [1].h = buttons[2].h = 20;
-++ buttons [0].x = xres / 4 - 2 * (buttons [0].w / 3);
-++ buttons [1].x = xres / 2 - buttons [0].w / 2;
-++ buttons [2].x = 3 * (xres / 4) - buttons [0].w / 3;
-++ buttons [0].y = buttons [1].y = buttons [2].y = 10;
-+ buttons [0].text = "Drag";
-+ buttons [1].text = "Draw";
-++ buttons [2].text = "Quit";
-+
-+ refresh_screen ();
-+
-+@@ -196,6 +198,12 @@ int main()
-+ mode = 1;
-+ refresh_screen ();
-+ break;
-++ case 2:
-++ close_framebuffer();
-++ fflush(stderr);
-++ fflush(stdout);
-++ exit(1);
-++ break;
-+ }
-+
-+ printf("%ld.%06ld: %6d %6d %6d\n", samp.tv.tv_sec, samp.tv.tv_usec,
diff --git a/patches/buildroot/2010.11/143-tslib-enable_raw_module.patch b/patches/buildroot/2010.11/143-tslib-enable_raw_module.patch
new file mode 100644
index 0000000..72a3151
--- /dev/null
+++ b/patches/buildroot/2010.11/143-tslib-enable_raw_module.patch
@@ -0,0 +1,39 @@
+From 250d2222baa74f5f5833a83716824f668fb7b958 Mon Sep 17 00:00:00 2001
+From: Daniel Nyström <dan...@ti...>
+Date: Tue, 21 Dec 2010 18:06:56 +0000
+Subject: tslib: Enable raw module in ts.conf
+
+By default there is no module activated in ts.conf. According to the
+ts.conf previously attached in the tslib package dir (which was never
+installed) the default module of choice was the raw module.
+
+This patch enables the raw module in the ts.conf file in the tslib
+source tree, which will be installed in the target.
+
+Signed-off-by: Daniel Nyström <dan...@ti...>
+Acked-by: Paulius Zaleckas <pau...@gm...>
+Acked-by: Luca Ceresoli <lu...@lu...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+diff --git a/package/tslib/tslib-enable_raw_module.patch b/package/tslib/tslib-enable_raw_module.patch
+new file mode 100644
+index 0000000..cb89338
+--- a/dev/null
++++ b/package/tslib/tslib-enable_raw_module.patch
+@@ -0,0 +1,14 @@
++Enable raw module by default
++
++Signed-off-by: Daniel Nyström <dan...@ti...>
++
++diff -Naur tslib-e000d35a.orig/etc/ts.conf tslib-e000d35a/etc/ts.conf
++--- tslib-e000d35a.orig/etc/ts.conf 2010-12-21 18:54:45.000000000 +0100
+++++ tslib-e000d35a/etc/ts.conf 2010-12-21 18:55:03.000000000 +0100
++@@ -1,5 +1,5 @@
++ # Uncomment if you wish to use the linux input layer event interface
++-# module_raw input
+++module_raw input
++
++ # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
++ # module_raw collie
+--
+cgit v0.8.2.1
diff --git a/patches/buildroot/2010.11/144-tslib-bump_version_to_current_git_head.patch b/patches/buildroot/2010.11/144-tslib-bump_version_to_current_git_head.patch
new file mode 100644
index 0000000..1484d27
--- /dev/null
+++ b/patches/buildroot/2010.11/144-tslib-bump_version_to_current_git_head.patch
@@ -0,0 +1,252 @@
+From 36f33bc00f95b27702e07bacac8047f0d1882b62 Mon Sep 17 00:00:00 2001
+From: Daniel Nyström <dan...@ti...>
+Date: Tue, 21 Dec 2010 18:06:55 +0000
+Subject: tslib: bump version to current git head
+
+Due to missing official releases, fetch directly from GitHub
+repository. Many bugfixes since 1.0 and all previous patches in
+Buildroot are either applied or obsoleted.
+
+Signed-off-by: Daniel Nyström <dan...@ti...>
+Acked-by: Paulius Zaleckas <pau...@gm...>
+Acked-by: Luca Ceresoli <lu...@lu...>
+Signed-off-by: Peter Korsgaard <ja...@su...>
+---
+diff --git a/package/tslib/ts.conf b/package/tslib/ts.conf
+deleted file mode 100644
+index 1b0da93..0000000
+--- a/package/tslib/ts.conf
++++ b/dev/null
+@@ -1,25 +0,0 @@
+-# Uncomment if you wish to use the linux input layer event interface
+-module_raw input
+-
+-# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
+-# module_raw collie
+-
+-# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860
+-# module_raw corgi
+-
+-# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface
+-# module_raw ucb1x00
+-
+-# Uncomment if you're using an HP iPaq h3600 or similar
+-# module_raw h3600
+-
+-# Uncomment if you're using a Hitachi Webpad
+-# module_raw mk712
+-
+-# Uncomment if you're using an IBM Arctic II
+-# module_raw arctic2
+-
+-module pthres pmin=1
+-module variance delta=30
+-module dejitter delta=100
+-module linear
+diff --git a/package/tslib/tslib-1.0-absbit.patch b/package/tslib/tslib-1.0-absbit.patch
+deleted file mode 100644
+index 11e758d..0000000
+--- a/package/tslib/tslib-1.0-absbit.patch
++++ b/dev/null
+@@ -1,11 +0,0 @@
+---- a/plugins/input-raw.c 2008-02-28 14:25:33.000000000 -0500
+-+++ b/plugins/input-raw.c 2008-02-28 14:27:25.000000000 -0500
+-@@ -49,7 +49,7 @@ static int check_fd(struct tslib_input *
+- struct tsdev *ts = i->module.dev;
+- int version;
+- u_int32_t bit;
+-- u_int64_t absbit;
+-+ u_int32_t absbit;
+-
+- if (! ((ioctl(ts->fd, EVIOCGVERSION, &version) >= 0) &&
+- (version == EV_VERSION) &&
+diff --git a/package/tslib/tslib-1.0-link-plugins-against-libts.patch b/package/tslib/tslib-1.0-link-plugins-against-libts.patch
+deleted file mode 100644
+index d60b6a1..0000000
+--- a/package/tslib/tslib-1.0-link-plugins-against-libts.patch
++++ b/dev/null
+@@ -1,48 +0,0 @@
+-commit 12435b337ea074bd31ccb03aff58c7eefa86f31c
+-Author: kergoth <kergoth@a933c7a4-9bf7-0310-9141-a2e45189604d>
+-Date: Sat Nov 1 20:46:07 2008 +0000
+-
+- Link plugins against libts
+-
+- Some plugins use tslib functions. Link those plugins against libts.
+- The problem is easy to see with LDFLAGS="-Wl,-no-undefined".
+- Without this change DirectFB in unable to use tslib because symbols
+- in the tslib plugins can't be resolved.
+-
+- Signed-off-by: Ville Syrjala <sy...@sc...>
+- Signed-off-by: Chris Larson <cl...@ke...>
+-
+- git-svn-id: svn://svn.berlios.de/tslib/trunk/tslib@56 a933c7a4-9bf7-0310-9141-a2e45189604d
+-
+-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+-index 3b902c2..4c4ef8b 100644
+---- a/plugins/Makefile.am
+-+++ b/plugins/Makefile.am
+-@@ -114,15 +114,19 @@ pluginexec_LTLIBRARIES = \
+-
+- variance_la_SOURCES = variance.c
+- variance_la_LDFLAGS = -module $(LTVSN)
+-+variance_la_LIBADD = $(top_builddir)/src/libts.la
+-
+- dejitter_la_SOURCES = dejitter.c
+- dejitter_la_LDFLAGS = -module $(LTVSN)
+-+dejitter_la_LIBADD = $(top_builddir)/src/libts.la
+-
+- linear_la_SOURCES = linear.c
+- linear_la_LDFLAGS = -module $(LTVSN)
+-+linear_la_LIBADD = $(top_builddir)/src/libts.la
+-
+- pthres_la_SOURCES = pthres.c
+- pthres_la_LDFLAGS = -module $(LTVSN)
+-+pthres_la_LIBADD = $(top_builddir)/src/libts.la
+-
+- # hw access
+- corgi_la_SOURCES = corgi-raw.c
+-@@ -148,6 +152,7 @@ tatung_la_LDFLAGS = -module $(LTVSN)
+-
+- input_la_SOURCES = input-raw.c
+- input_la_LDFLAGS = -module $(LTVSN)
+-+input_la_LIBADD = $(top_builddir)/src/libts.la
+-
+- linear_h2200_la_SOURCES = linear-h2200.c
+- linear_h2200_la_LDFLAGS = -module $(LTVSN)
+diff --git a/package/tslib/tslib-1.0-no-cxx.patch b/package/tslib/tslib-1.0-no-cxx.patch
+deleted file mode 100644
+index 7e4e6d5..0000000
+--- a/package/tslib/tslib-1.0-no-cxx.patch
++++ b/dev/null
+@@ -1,17 +0,0 @@
+-tslib: Doesn't use C++, so don't require it in the configure script
+----
+- configure.ac | 1 -
+- 1 file changed, 1 deletion(-)
+-
+-Index: tslib-1.0/configure.ac
+-===================================================================
+---- tslib-1.0.orig/configure.ac
+-+++ tslib-1.0/configure.ac
+-@@ -15,7 +15,6 @@
+- TS_DEFAULT_FLAGS
+-
+- # Checks for programs.
+--AC_PROG_CXX
+- AC_PROG_CC
+- AC_PROG_CPP
+- TS_CC_HIDDEN_VISIBILITY
+diff --git a/package/tslib/tslib-1.0-open-with-O_CREAT-needs-3-arguments.patch b/package/tslib/tslib-1.0-open-with-O_CREAT-needs-3-arguments.patch
+deleted file mode 100644
+index 5b23dd0..0000000
+--- a/package/tslib/tslib-1.0-open-with-O_CREAT-needs-3-arguments.patch
++++ b/dev/null
+@@ -1,53 +0,0 @@
+-From 4769d044fad6033053ee39c1fcd5ccc7693c6f71 Mon Sep 17 00:00:00 2001
+-From: kergoth <kergoth@a933c7a4-9bf7-0310-9141-a2e45189604d>
+-Date: Tue, 24 Mar 2009 17:42:34 +0000
+-Subject: [PATCH] tslib fails to compile on Ubuntu 8.10+, easy patch
+-
+-I noticed that gcc fails to compile the latest svn copy of tslib due
+-to a potentially "unsafe" use of open(). Ubuntu 8.10+, for instance,
+-by default enables the compiler flag -D_FORTIFY_SOURCE=2 which throws
+-an error on lines 253 and 255 of ts_calibrate.c. This is a pretty
+-minor issue, but could potentially stop some people using Ubuntu from
+-compiling unless they realize what's going on.
+-
+-To fix this, all you need to do is set a mode in the open() call. I
+-patched ts_calibrate.c to set 0644 (S_IRUSR | S_IWUSR | S_IRGRP |
+-S_IROTH) and it compiles fine. See below.
+-
+-Signed-off-by: Daniel Jabbour <da...@la...>
+-Signed-off-by: Chris Larson <cl...@ke...>
+-
+-git-svn-id: svn://svn.berlios.de/tslib/trunk/tslib@72 a933c7a4-9bf7-0310-9141-a2e45189604d
+----
+- tests/ts_calibrate.c | 7 +++++--
+- 1 files changed, 5 insertions(+), 2 deletions(-)
+-
+-diff --git a/tests/ts_calibrate.c b/tests/ts_calibrate.c
+-index 04c75dc..00e9580 100644
+---- a/tests/ts_calibrate.c
+-+++ b/tests/ts_calibrate.c
+-@@ -21,6 +21,7 @@
+- #include <sys/ioctl.h>
+- #include <sys/mman.h>
+- #include <sys/time.h>
+-+#include <sys/stat.h>
+- #include <linux/kd.h>
+- #include <linux/vt.h>
+- #include <linux/fb.h>
+-@@ -250,9 +251,11 @@ int main()
+- for (i = 0; i < 7; i++) printf("%d ", cal.a [i]);
+- printf("\n");
+- if ((calfile = getenv("TSLIB_CALIBFILE")) != NULL) {
+-- cal_fd = open (calfile, O_CREAT | O_RDWR);
+-+ cal_fd = open (calfile, O_CREAT | O_RDWR,
+-+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+- } else {
+-- cal_fd = open ("/etc/pointercal", O_CREAT | O_RDWR);
+-+ cal_fd = open ("/etc/pointercal", O_CREAT | O_RDWR,
+-+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+- }
+- sprintf (cal_buffer,"%d %d %d %d %d %d %d",
+- cal.a[1], cal.a[2], cal.a[0],
+---
+-1.7.0
+-
+diff --git a/package/tslib/tslib-1.0-remove-bzero.patch b/package/tslib/tslib-1.0-remove-bzero.patch
+deleted file mode 100644
+index 3e3ef3e..0000000
+--- a/package/tslib/tslib-1.0-remove-bzero.patch
++++ b/dev/null
+@@ -1,11 +0,0 @@
+---- a/src/ts_parse_vars.c 2006-08-24 17:02:55.000000000 -0400
+-+++ b/src/ts_parse_vars.c 2008-03-12 13:57:01.000000000 -0400
+-@@ -33,7 +33,7 @@ int tslib_parse_vars(struct tslib_module
+- return 0;
+-
+- //s = alloca(strlen(str));
+-- bzero(s_holder,1024);
+-+ memset(s_holder, 0, 1024);
+- strncpy(s_holder,str,strlen(str));
+- s = s_holder;
+- while ((p = strsep(&s, " \t")) != NULL && ret == 0) {
+diff --git a/package/tslib/tslib-1.0-remove-return-on-error-from-check-df.patch b/package/tslib/tslib-1.0-remove-return-on-error-from-check-df.patch
+deleted file mode 100644
+index 7945c1b..0000000
+--- a/package/tslib/tslib-1.0-remove-return-on-error-from-check-df.patch
++++ b/dev/null
+@@ -1,11 +0,0 @@
+---- a/plugins/input-raw.c 2008-01-25 14:02:23.000000000 +0100
+-+++ b/plugins/input-raw.new.c 2008-01-25 14:02:50.000000000 +0100
+-@@ -58,8 +58,6 @@ static int check_fd(struct tslib_input *
+- (ioctl(ts->fd, EVIOCGBIT(EV_ABS, sizeof(absbit) * 8), &absbit) >= 0) &&
+- (absbit & (1 << ABS_X)) &&
+- (absbit & (1 << ABS_Y)) && (absbit & (1 << ABS_PRESSURE)))) {
+-- fprintf(stderr, "selected device is not a touchscreen I understand\n");
+-- return -1;
+- }
+-
+- if (bit & (1 << EV_SYN))
+diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk
+index 798499e..3ca40c5 100644
+--- a/package/tslib/tslib.mk
++++ b/package/tslib/tslib.mk
+@@ -3,11 +3,9 @@
+ # tslib
+ #
+ #############################################################
+-TSLIB_VERSION:=1.0
+-TSLIB_SOURCE:=tslib-$(TSLIB_VERSION).tar.bz2
+-TSLIB_SITE:=http://download.berlios.de/tslib
++TSLIB_VERSION:=860d69ca
++TSLIB_SITE:=git://github.com/kergoth/tslib.git
+ TSLIB_AUTORECONF = YES
+-TSLIB_LIBTOOL_PATCH = YES
+ TSLIB_INSTALL_STAGING = YES
+ TSLIB_INSTALL_TARGET = YES
+ TSLIB_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
+--
+cgit v0.8.2.1
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-02-07 13:31:46
|
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 caa6b4faaa9025d4540f33f7b82547efa5415acc (commit)
via b872b40de7f0569ba2d387babf5a5b0a4fa7bea6 (commit)
from 21cb6bf7af62f31deec11afbafd7a5c546e37234 (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 caa6b4faaa9025d4540f33f7b82547efa5415acc
Author: Julien Boibessot <jul...@ar...>
Date: Mon Feb 7 14:30:56 2011 +0100
[LINUX] Moves APF27 2.6.3x support from 2.6.36 to 2.6.38-rc3 (part 2)
commit b872b40de7f0569ba2d387babf5a5b0a4fa7bea6
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 4 23:21:29 2011 +0100
[LINUX] Moves APF27 2.6.3x support from 2.6.36 to 2.6.38-rc3 (part1)
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf27/apf27-linux-2.6.38-rc3.config | 1 +
...nux-2.6.36.config => apf27-linux-2.6.38.config} | 200 +++++++---
...at-mxc-gpio-mxc_gpio_set_behaviour_change.patch | 21 -
...us-joystick-adding_as5011_joystick_driver.patch | 434 --------------------
...15-armadeus-logo-add_armadeus-project_tux.patch | 0
.../{2.6.36 => 2.6.38}/021-armadeus-apf9328.patch | 24 +-
.../023-armadeus-fblcd-kconfig.patch | 0
...s-apf9328-add_board_to_linux_build_system.patch | 0
.../029-armadeus-add_csi_and_spi_registers.patch | 0
.../030-armadeus-imx-devices.tofix} | 10 -
.../030-armadeus-imx_udc-change_clk_get.patch | 0
...7-armadeus-imx_udc-add_printk_when_probed.patch | 0
...s-imx_udc-prevent_crash_after_soft_reboot.patch | 0
...50-armadeus-add_custom_drivers_to_kconfig.patch | 0
.../063-armadeus-max1027-add_max1027_include.patch | 0
...rmadeus-add_backlight_machinfo_to_imxfb_h.patch | 3 +-
...adeus-imxfb-suppress_32_bpp_case_for_imx1.patch | 0
.../{2.6.36 => 2.6.38}/073-armadeus-tsc2102.patch | 0
...02_integrate_driver_to_linux_build_system.patch | 0
...chscreen-add_driver_to_linux_build_system.patch | 0
.../074-armadeus-tsc2102-touchscreen.patch | 0
.../075-armadeus-clock-imx1_add_spi2_clock.patch | 6 +-
.../075-armadeus-spi2-reg-defines.patch | 0
...announce_imx_is_supporting_scatter_gather.patch | 0
...eus-clock_correct_mxc_decode_pll_for_imx1.patch | 0
...madeus-clock-imx1_avoid_crash_with_module.patch | 0
...27-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref | 0
.../240-armadeus-mxc_nand-fixes_bbt.patch | 0
...llows_multiple_nand_chips_boot_parameters.patch | 0
.../281-apf27-armadeus-add_apf27.c.patch | 169 +++-----
...-apf27-armadeus-add_apf27_to_build_system.patch | 24 +-
...omux-add_correct_directions_to_SPI2_gpios.patch | 0
...291-apf27-armadeus-add_mach_board-apf27_h.patch | 0
...tions_to_individually_activate_spi_busses.patch | 0
...us-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch | 0
.../314-armadeus-ad9889-add_driver.patch | 0
.../315-darius-imx_wdt-add_watchdog_driver.patch | 0
...deus-soc_camera_add_ov96xx_sensors_driver.patch | 0
.../322-apf27-armadeus-add_mach_fpga_h.patch | 0
...apf27-armadeus-increases_board_irq_number.patch | 0
...-imxfb-power_on_backlight_after_lcd_logic.patch | 0
...-makes_setpalettereg_compatible_with_mx27.patch | 0
...mx2_bit_per_pixel_selection_in_PCR_fields.patch | 0
...-add_platform_data_init_support_to_spidev.patch | 0
...ial-add_uart_modules_selection_in_kconfig.patch | 8 +-
..._are_not_available_on_apf27_based_designs.patch | 10 +-
...isplay_gpio_number_when_reservation_fails.patch | 0
...c-armadeus-lan95xx-activate_blinking_leds.patch | 0
...ing_mangling_capability_on_i2c_imx_driver.patch | 0
.../2.6.38/400-armadeus-add_apf51_module.patch | 6 +-
50 files changed, 259 insertions(+), 657 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38-rc3.config
rename buildroot/target/device/armadeus/apf27/{apf27-linux-2.6.36.config => apf27-linux-2.6.38.config} (92%)
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/348-armadeus-plat-mxc-gpio-mxc_gpio_set_behaviour_change.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/359-armadeus-joystick-adding_as5011_joystick_driver.patch
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/015-armadeus-logo-add_armadeus-project_tux.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/021-armadeus-apf9328.patch (97%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/023-armadeus-fblcd-kconfig.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/024-armadeus-apf9328-add_board_to_linux_build_system.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/029-armadeus-add_csi_and_spi_registers.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36/030-armadeus-imx-devices.patch => 2.6.38/030-armadeus-imx-devices.tofix} (82%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/030-armadeus-imx_udc-change_clk_get.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/037-armadeus-imx_udc-add_printk_when_probed.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/038-armadeus-imx_udc-prevent_crash_after_soft_reboot.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/050-armadeus-add_custom_drivers_to_kconfig.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/063-armadeus-max1027-add_max1027_include.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch (89%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/072-armadeus-imxfb-suppress_32_bpp_case_for_imx1.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/073-armadeus-tsc2102.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/074-armadeus-tsc2102-touchscreen.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/075-armadeus-clock-imx1_add_spi2_clock.patch (76%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/075-armadeus-spi2-reg-defines.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/098-armadeus-imx-dma-announce_imx_is_supporting_scatter_gather.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/100-armadeus-clock_correct_mxc_decode_pll_for_imx1.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/101-armadeus-clock-imx1_avoid_crash_with_module.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/240-apf27-armadeus-fixe-bugs-drivers_mxc_nand.c.as_ref (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/240-armadeus-mxc_nand-fixes_bbt.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/240b-armadeus-mxc_nand-allows_multiple_nand_chips_boot_parameters.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/281-apf27-armadeus-add_apf27.c.patch (94%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/282-apf27-armadeus-add_apf27_to_build_system.patch (83%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/290-armadeus-mx2-iomux-add_correct_directions_to_SPI2_gpios.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/291-apf27-armadeus-add_mach_board-apf27_h.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/293-armadeus-spi_imx-add_config_options_to_individually_activate_spi_busses.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/301-armadeus-mx2_ssi-SSIn_TXD_are_ouputs_not_inputs.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/314-armadeus-ad9889-add_driver.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/315-darius-imx_wdt-add_watchdog_driver.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/319-armadeus-soc_camera_add_ov96xx_sensors_driver.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/322-apf27-armadeus-add_mach_fpga_h.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/323-apf27-armadeus-increases_board_irq_number.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/333-armadeus-imxfb-makes_distinction_between_mx1_and_mx2_bit_per_pixel_selection_in_PCR_fields.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/341-apf27-armadeus-serial-add_uart_modules_selection_in_kconfig.patch (88%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/342-apf27-armadeus-serial-some_uart_pins_are_not_available_on_apf27_based_designs.patch (81%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/345-apf27-armadeus-iomux-display_gpio_number_when_reservation_fails.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/347c-armadeus-lan95xx-activate_blinking_leds.patch (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.36 => 2.6.38}/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38-rc3.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38-rc3.config
new file mode 120000
index 0000000..e7419d6
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38-rc3.config
@@ -0,0 +1 @@
+apf27-linux-2.6.38.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
similarity index 92%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
index 153e9ed..bfb707e 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.36
-# Mon Jan 10 17:27:13 2011
+# Linux/arm 2.6.38-rc3 Kernel Configuration
+# Mon Feb 7 09:38:43 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -9,7 +9,6 @@ CONFIG_GENERIC_GPIO=y
# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_HAVE_PROC_CPU=y
-CONFIG_GENERIC_HARDIRQS=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_LOCKDEP_SUPPORT=y
@@ -17,13 +16,15 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
#
# General setup
@@ -49,13 +50,26 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
+CONFIG_HAVE_SPARSE_IRQ=y
+# CONFIG_GENERIC_PENDING_IRQ is not set
+# CONFIG_AUTO_IRQ_AFFINITY is not set
+# CONFIG_IRQ_PER_CPU is not set
+# CONFIG_SPARSE_IRQ is not set
#
# RCU Subsystem
#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
+CONFIG_TREE_PREEMPT_RCU=y
# CONFIG_TINY_RCU is not set
+# CONFIG_TINY_PREEMPT_RCU is not set
+CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
@@ -63,13 +77,15 @@ CONFIG_RCU_FANOUT=32
# CONFIG_IKCONFIG is not set
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_RELAY is not set
# CONFIG_NAMESPACES is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SYSFS_DEPRECATED is not set
+# CONFIG_RELAY is not set
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
+CONFIG_EXPERT=y
CONFIG_EMBEDDED=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
@@ -108,6 +124,7 @@ CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
#
# GCOV-based kernel profiling
@@ -186,6 +203,7 @@ CONFIG_MMU=y
# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
CONFIG_ARCH_MXC=y
+# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_STMP3XXX is not set
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_H720X is not set
@@ -215,12 +233,13 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_S3C2410 is not set
# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_S5P6440 is not set
+# CONFIG_ARCH_S5P64X0 is not set
# CONFIG_ARCH_S5P6442 is not set
# CONFIG_ARCH_S5PC100 is not set
# CONFIG_ARCH_S5PV210 is not set
# CONFIG_ARCH_S5PV310 is not set
# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_TCC_926 is not set
# CONFIG_ARCH_LH7A40X is not set
# CONFIG_ARCH_U300 is not set
# CONFIG_ARCH_U8500 is not set
@@ -228,8 +247,15 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_PLAT_SPEAR is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+CONFIG_IMX_HAVE_PLATFORM_FEC=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_FB=y
CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
+CONFIG_IMX_HAVE_PLATFORM_IMX_SSI=y
CONFIG_IMX_HAVE_PLATFORM_IMX_UART=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI=y
+CONFIG_IMX_HAVE_PLATFORM_MXC_MMC=y
CONFIG_IMX_HAVE_PLATFORM_MXC_NAND=y
CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y
@@ -254,6 +280,7 @@ CONFIG_MACH_MX27=y
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_CPUIMX27 is not set
# CONFIG_MACH_MX27_3DS is not set
+# CONFIG_MACH_IMX27_VISSTRIM_M10 is not set
# CONFIG_MACH_IMX27LITE is not set
# CONFIG_MACH_PCA100 is not set
# CONFIG_MACH_MXT_TD60 is not set
@@ -264,6 +291,7 @@ CONFIG_MACH_APF27_DEV=y
CONFIG_MACH_APF27_DEV_EXT_NONE=y
# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
# CONFIG_MXC_IRQ_PRIOR is not set
+CONFIG_MXC_AVIC=y
# CONFIG_MXC_PWM is not set
# CONFIG_MXC_DEBUG_BOARD is not set
CONFIG_MXC_ULPI=y
@@ -282,6 +310,7 @@ CONFIG_CPU_COPY_V4WB=y
CONFIG_CPU_TLB_V4WBI=y
CONFIG_CPU_CP15=y
CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_USE_DOMAINS=y
#
# Processor Features
@@ -292,7 +321,6 @@ CONFIG_ARM_THUMB=y
# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
CONFIG_ARM_L1_CACHE_SHIFT=5
-CONFIG_COMMON_CLKDEV=y
#
# Bus support
@@ -321,7 +349,6 @@ CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
# CONFIG_HIGHMEM is not set
-# CONFIG_SPARSE_IRQ is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
@@ -329,14 +356,17 @@ CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=999999
+# CONFIG_COMPACTION is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=0
CONFIG_VIRT_TO_BUS=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_NEED_PER_CPU_KM=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
+# CONFIG_SECCOMP is not set
# CONFIG_CC_STACKPROTECTOR is not set
# CONFIG_DEPRECATED_PARAM_STRUCT is not set
@@ -348,6 +378,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
# CONFIG_AUTO_ZRELADDR is not set
#
@@ -386,7 +417,6 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_VERBOSE=y
CONFIG_CAN_PM_TRACE=y
CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_NVS=y
CONFIG_SUSPEND=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_SUSPEND_FREEZER=y
@@ -416,7 +446,7 @@ CONFIG_IP_PNP=y
# CONFIG_IP_PNP_BOOTP is not set
# CONFIG_IP_PNP_RARP is not set
# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
+# CONFIG_NET_IPGRE_DEMUX is not set
# CONFIG_IP_MROUTE is not set
# CONFIG_ARPD is not set
# CONFIG_SYN_COOKIES is not set
@@ -479,6 +509,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_NET_SCHED is not set
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
#
# Network testing
@@ -493,6 +524,7 @@ CONFIG_CAN_BCM=m
# CAN Device Drivers
#
CONFIG_CAN_VCAN=m
+# CONFIG_CAN_SLCAN is not set
CONFIG_CAN_DEV=m
# CONFIG_CAN_CALC_BITTIMING is not set
CONFIG_CAN_MCP251X=m
@@ -503,6 +535,7 @@ CONFIG_CAN_MCP251X=m
#
# CONFIG_CAN_EMS_USB is not set
# CONFIG_CAN_ESD_USB2 is not set
+# CONFIG_CAN_SOFTING is not set
# CONFIG_CAN_DEBUG_DEVICES is not set
# CONFIG_IRDA is not set
CONFIG_BT=m
@@ -557,13 +590,13 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
-# CONFIG_MAC80211_LEDS is not set
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
# CONFIG_WIMAX is not set
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
#
# Device Drivers
@@ -666,10 +699,6 @@ CONFIG_MTD_NAND_MXC=y
# LPDDR flash memory drivers
#
# CONFIG_MTD_LPDDR is not set
-
-#
-# UBI - Unsorted block images
-#
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
@@ -693,13 +722,18 @@ CONFIG_BLK_DEV=y
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_MG_DISK is not set
+# CONFIG_BLK_DEV_RBD is not set
CONFIG_MISC_DEVICES=y
# CONFIG_AD525X_DPOT is not set
# CONFIG_ICS932S401 is not set
# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_APDS9802ALS is not set
# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
# CONFIG_SENSORS_TSL2550 is not set
# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
# CONFIG_HMC6352 is not set
# CONFIG_DS1682 is not set
# CONFIG_TI_DAC7512 is not set
@@ -715,6 +749,10 @@ CONFIG_EEPROM_AT25=y
# CONFIG_EEPROM_MAX6875 is not set
# CONFIG_EEPROM_93CX6 is not set
# CONFIG_IWMC3200TOP is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -751,6 +789,7 @@ CONFIG_SCSI_WAIT_SCAN=m
# CONFIG_SCSI_SPI_ATTRS is not set
# CONFIG_SCSI_FC_ATTRS is not set
# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_ATTRS is not set
# CONFIG_SCSI_SAS_LIBSAS is not set
# CONFIG_SCSI_SRP_ATTRS is not set
CONFIG_SCSI_LOWLEVEL=y
@@ -763,6 +802,7 @@ CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_OSD_INITIATOR is not set
# CONFIG_ATA is not set
# CONFIG_MD is not set
+# CONFIG_TARGET_CORE is not set
CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
@@ -770,6 +810,7 @@ CONFIG_NETDEVICES=y
# CONFIG_EQUALIZER is not set
# CONFIG_TUN is not set
# CONFIG_VETH is not set
+# CONFIG_MII is not set
CONFIG_PHYLIB=y
#
@@ -783,6 +824,7 @@ CONFIG_PHYLIB=y
# CONFIG_VITESSE_PHY is not set
# CONFIG_SMSC_PHY is not set
# CONFIG_BROADCOM_PHY is not set
+# CONFIG_BCM63XX_PHY is not set
# CONFIG_ICPLUS_PHY is not set
# CONFIG_REALTEK_PHY is not set
# CONFIG_NATIONAL_PHY is not set
@@ -792,7 +834,6 @@ CONFIG_PHYLIB=y
# 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
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
@@ -812,7 +853,6 @@ CONFIG_NET_ETHERNET=y
# CONFIG_KS8851 is not set
# CONFIG_KS8851_MLL 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
@@ -843,7 +883,9 @@ CONFIG_RT2X00_LIB=m
CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
# CONFIG_RT2X00_DEBUG is not set
-# CONFIG_WL12XX is not set
+# CONFIG_RTL8192CE is not set
+# CONFIG_WL1251 is not set
+# CONFIG_WL12XX_MENU is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
@@ -932,6 +974,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
# CONFIG_TOUCHSCREEN_ADS7846 is not set
# CONFIG_TOUCHSCREEN_AD7877 is not set
# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_BU21013 is not set
# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
# CONFIG_TOUCHSCREEN_DYNAPRO is not set
# CONFIG_TOUCHSCREEN_HAMPSHIRE is not set
@@ -953,6 +996,7 @@ CONFIG_TOUCHSCREEN_TSC2102=m
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
# CONFIG_TOUCHSCREEN_TPS6507X is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_AD714X is not set
@@ -966,6 +1010,7 @@ CONFIG_INPUT_UINPUT=m
# CONFIG_INPUT_PCF8574 is not set
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_CMA3000 is not set
#
# Hardware I/O ports
@@ -975,6 +1020,7 @@ CONFIG_SERIO_SERPORT=y
CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_RAW is not set
# CONFIG_SERIO_ALTERA_PS2 is not set
+# CONFIG_SERIO_PS2MULT is not set
# CONFIG_GAMEPORT is not set
#
@@ -1012,9 +1058,12 @@ CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_ALTERA_JTAGUART is not set
# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_LEGACY_PTYS is not set
+# CONFIG_TTY_PRINTK is not set
+# CONFIG_HVC_DCC is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM is not set
# CONFIG_R3964 is not set
@@ -1065,10 +1114,12 @@ CONFIG_SPI_MASTER=y
#
CONFIG_SPI_BITBANG=y
# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_IMX_VER_0_0=y
CONFIG_SPI_IMX=y
CONFIG_SPI_MXC_SELECT1=y
CONFIG_SPI_MXC_SELECT2=y
CONFIG_SPI_MXC_SELECT3=y
+# CONFIG_SPI_PXA2XX_PCI is not set
# CONFIG_SPI_XILINX is not set
# CONFIG_SPI_DESIGNWARE is not set
@@ -1083,6 +1134,10 @@ CONFIG_SPI_TSC2102=m
# PPS support
#
# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
# CONFIG_GPIO_SYSFS is not set
@@ -1090,6 +1145,7 @@ CONFIG_GPIOLIB=y
#
# Memory mapped GPIO expanders:
#
+# CONFIG_GPIO_BASIC_MMIO is not set
# CONFIG_GPIO_IT8761E is not set
#
@@ -1097,7 +1153,6 @@ CONFIG_GPIOLIB=y
#
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_ADP5588 is not set
@@ -1112,6 +1167,7 @@ CONFIG_GPIOLIB=y
# CONFIG_GPIO_MAX7301 is not set
# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
#
# AC97 GPIO expanders:
@@ -1144,6 +1200,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_ADT7475 is not set
# CONFIG_SENSORS_ASC7621 is not set
# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS620 is not set
# CONFIG_SENSORS_DS1621 is not set
# CONFIG_SENSORS_F71805F is not set
# CONFIG_SENSORS_F71882FG is not set
@@ -1151,6 +1208,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_G760A is not set
# CONFIG_SENSORS_GL518SM is not set
# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_GPIO_FAN is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_JC42 is not set
# CONFIG_SENSORS_LM63 is not set
@@ -1168,6 +1226,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_LM93 is not set
# CONFIG_SENSORS_LTC4215 is not set
# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_LTC4261 is not set
# CONFIG_SENSORS_LM95241 is not set
# CONFIG_SENSORS_MAX1111 is not set
# CONFIG_SENSORS_MAX1619 is not set
@@ -1176,6 +1235,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
# CONFIG_SENSORS_SMM665 is not set
# CONFIG_SENSORS_DME1737 is not set
# CONFIG_SENSORS_EMC1403 is not set
@@ -1195,6 +1255,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_W83791D is not set
# CONFIG_SENSORS_W83792D is not set
# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83795 is not set
# CONFIG_SENSORS_W83L785TS is not set
# CONFIG_SENSORS_W83L786NG is not set
# CONFIG_SENSORS_W83627HF is not set
@@ -1234,7 +1295,7 @@ CONFIG_MFD_SUPPORT=y
# CONFIG_TPS6507X is not set
# CONFIG_TWL4030_CORE is not set
# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_TC35892 is not set
+# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_T7L66XB is not set
# CONFIG_MFD_TC6387XB is not set
@@ -1244,15 +1305,16 @@ CONFIG_MFD_SUPPORT=y
# CONFIG_MFD_MAX8925 is not set
# CONFIG_MFD_MAX8998 is not set
# CONFIG_MFD_WM8400 is not set
-# CONFIG_MFD_WM831X is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_MFD_WM8350_I2C is not set
# CONFIG_MFD_WM8994 is not set
# CONFIG_MFD_PCF50633 is not set
-# CONFIG_MFD_MC13783 is not set
+# CONFIG_MFD_MC13XXX is not set
# CONFIG_ABX500_CORE is not set
# CONFIG_EZX_PCAP is not set
-# CONFIG_AB8500_CORE is not set
# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_WL1273_CORE is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
@@ -1261,20 +1323,20 @@ CONFIG_MEDIA_SUPPORT=m
#
CONFIG_VIDEO_DEV=m
CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
# CONFIG_DVB_CORE is not set
CONFIG_VIDEO_MEDIA=m
#
# Multimedia drivers
#
-# CONFIG_IR_CORE is not set
+# CONFIG_RC_CORE is not set
# CONFIG_MEDIA_ATTACH is not set
CONFIG_MEDIA_TUNER=m
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
CONFIG_MEDIA_TUNER_TDA9887=m
CONFIG_MEDIA_TUNER_TEA5761=m
CONFIG_MEDIA_TUNER_TEA5767=m
@@ -1283,7 +1345,6 @@ CONFIG_MEDIA_TUNER_XC2028=m
CONFIG_MEDIA_TUNER_XC5000=m
CONFIG_MEDIA_TUNER_MC44S803=m
CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
CONFIG_VIDEOBUF_GEN=m
CONFIG_VIDEOBUF_DMA_CONTIG=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
@@ -1301,7 +1362,6 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_TVAUDIO is not set
# CONFIG_VIDEO_TDA7432 is not set
# CONFIG_VIDEO_TDA9840 is not set
-# CONFIG_VIDEO_TDA9875 is not set
# CONFIG_VIDEO_TEA6415C is not set
# CONFIG_VIDEO_TEA6420 is not set
# CONFIG_VIDEO_MSP3400 is not set
@@ -1366,11 +1426,11 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_UPD64031A is not set
# CONFIG_VIDEO_UPD64083 is not set
# CONFIG_VIDEO_VIVI is not set
-# CONFIG_VIDEO_CPIA is not set
# CONFIG_VIDEO_CPIA2 is not set
-# CONFIG_VIDEO_SAA5246A is not set
-# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_VIDEO_TIMBERDALE is not set
+# CONFIG_VIDEO_SR030PC30 is not set
CONFIG_SOC_CAMERA=m
+# CONFIG_SOC_CAMERA_IMX074 is not set
# CONFIG_SOC_CAMERA_MT9M001 is not set
# CONFIG_SOC_CAMERA_MT9M111 is not set
# CONFIG_SOC_CAMERA_MT9T031 is not set
@@ -1379,6 +1439,8 @@ CONFIG_SOC_CAMERA=m
# CONFIG_SOC_CAMERA_RJ54N1 is not set
# CONFIG_SOC_CAMERA_TW9910 is not set
# CONFIG_SOC_CAMERA_PLATFORM is not set
+# CONFIG_SOC_CAMERA_OV2640 is not set
+# CONFIG_SOC_CAMERA_OV6650 is not set
# CONFIG_SOC_CAMERA_OV772X is not set
# CONFIG_SOC_CAMERA_OV9640 is not set
# CONFIG_SOC_CAMERA_OV96XX is not set
@@ -1399,6 +1461,7 @@ CONFIG_USB_GSPCA=m
# CONFIG_USB_GSPCA_ETOMS is not set
# CONFIG_USB_GSPCA_FINEPIX is not set
# CONFIG_USB_GSPCA_JEILINJ is not set
+# CONFIG_USB_GSPCA_KONICA is not set
# CONFIG_USB_GSPCA_MARS is not set
# CONFIG_USB_GSPCA_MR97310A is not set
# CONFIG_USB_GSPCA_OV519 is not set
@@ -1427,15 +1490,12 @@ CONFIG_USB_GSPCA=m
# CONFIG_USB_GSPCA_T613 is not set
# CONFIG_USB_GSPCA_TV8532 is not set
# CONFIG_USB_GSPCA_VC032X is not set
+# CONFIG_USB_GSPCA_XIRLINK_CIT is not set
# CONFIG_USB_GSPCA_ZC3XX is not set
# CONFIG_VIDEO_PVRUSB2 is not set
# CONFIG_VIDEO_HDPVR is not set
# CONFIG_VIDEO_USBVISION is not set
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
# CONFIG_USB_ET61X251 is not set
-# CONFIG_USB_SE401 is not set
# CONFIG_USB_SN9C102 is not set
# CONFIG_USB_PWC is not set
# CONFIG_USB_ZR364XX is not set
@@ -1443,11 +1503,11 @@ CONFIG_USB_GSPCA=m
# CONFIG_USB_S2255 is not set
# CONFIG_V4L_MEM2MEM_DRIVERS is not set
# CONFIG_RADIO_ADAPTERS is not set
-# CONFIG_DAB is not set
#
# Graphics support
#
+CONFIG_HAVE_FB_IMX=y
# CONFIG_DRM is not set
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1455,15 +1515,16 @@ CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
# CONFIG_FB_SYS_FILLRECT is not set
# CONFIG_FB_SYS_COPYAREA is not set
# CONFIG_FB_SYS_IMAGEBLIT is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_WMT_GE_ROPS is not set
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
@@ -1473,8 +1534,15 @@ CONFIG_FB=y
#
# Frame buffer hardware drivers
#
-# CONFIG_FB_IMX is not set
+CONFIG_FB_IMX=y
+# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
+# CONFIG_FB_IMX_HITACHI_TX12D17VM1BDP_TFT is not set
+# CONFIG_FB_IMX_OPTREX_T51638D084_TFT is not set
+CONFIG_FB_IMX_SHARP_LQ043_TFT=y
+# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
+# CONFIG_FB_IMX_CUSTOM_LCD is not set
# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_UDL is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
@@ -1488,8 +1556,8 @@ CONFIG_LCD_CLASS_DEVICE=m
# CONFIG_LCD_VGG2432A4 is not set
# CONFIG_LCD_PLATFORM is not set
# CONFIG_LCD_S6E63M0 is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
#
@@ -1544,6 +1612,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_EMU10K1_SEQ is not set
CONFIG_SND_DRIVERS=y
# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_ALOOP is not set
# CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set
@@ -1580,10 +1649,13 @@ CONFIG_USB_HID=y
# CONFIG_HID_PRODIKEYS is not set
# CONFIG_HID_CYPRESS is not set
# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
# CONFIG_HID_EGALAX is not set
# CONFIG_HID_ELECOM is not set
# CONFIG_HID_EZKEY is not set
# CONFIG_HID_KYE is not set
+# CONFIG_HID_UCLOGIC is not set
+# CONFIG_HID_WALTOP is not set
# CONFIG_HID_GYRATION is not set
# CONFIG_HID_TWINHAN is not set
# CONFIG_HID_KENSINGTON is not set
@@ -1592,6 +1664,7 @@ CONFIG_USB_HID=y
# CONFIG_HID_MICROSOFT is not set
# CONFIG_HID_MOSART is not set
# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
# CONFIG_HID_ORTEK is not set
# CONFIG_HID_PANTHERLORD is not set
@@ -1600,6 +1673,8 @@ CONFIG_USB_HID=y
# CONFIG_HID_QUANTA is not set
# CONFIG_HID_ROCCAT is not set
# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
+# CONFIG_HID_ROCCAT_PYRA is not set
# CONFIG_HID_SAMSUNG is not set
# CONFIG_HID_SONY is not set
# CONFIG_HID_STANTUM is not set
@@ -1676,6 +1751,7 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_ONETOUCH is not set
# CONFIG_USB_STORAGE_KARMA is not set
# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_UAS is not set
# CONFIG_USB_LIBUSUAL is not set
#
@@ -1711,6 +1787,7 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_IOWARRIOR is not set
# CONFIG_USB_TEST is not set
# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_YUREX is not set
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
# CONFIG_USB_GADGET_DEBUG_FS is not set
@@ -1719,6 +1796,7 @@ CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_FSL_USB2=y
CONFIG_USB_FSL_USB2=y
# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA_U2O is not set
# CONFIG_USB_GADGET_M66592 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
@@ -1727,6 +1805,7 @@ CONFIG_USB_GADGET_DUALSPEED=y
CONFIG_USB_ETH=y
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_ETH_EEM is not set
+# CONFIG_USB_G_NCM is not set
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FUNCTIONFS is not set
# CONFIG_USB_FILE_STORAGE is not set
@@ -1799,11 +1878,13 @@ CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
#
# MMC/SD/SDIO Card Drivers
#
CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
@@ -1814,8 +1895,11 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_MMC_SDHCI is not set
CONFIG_MMC_MXC=y
# CONFIG_MMC_SPI is not set
+# CONFIG_MMC_DW is not set
+# CONFIG_MMC_USHC is not set
# CONFIG_MEMSTICK is not set
# CONFIG_NEW_LEDS is not set
+# CONFIG_NFC_DEVICES is not set
# CONFIG_ACCESSIBILITY is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
@@ -1829,7 +1913,6 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
# CONFIG_RTC_DRV_TEST is not set
#
@@ -1890,6 +1973,7 @@ CONFIG_RTC_MXC=m
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_STAGING is not set
+CONFIG_CLKDEV_LOOKUP=y
#
# File systems
@@ -1911,18 +1995,18 @@ CONFIG_JBD=y
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
+CONFIG_FS_POSIX_ACL=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
+# CONFIG_FANOTIFY is not set
# CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=y
+# CONFIG_QUOTACTL is not set
CONFIG_AUTOFS4_FS=y
# CONFIG_FUSE_FS is not set
@@ -2010,6 +2094,7 @@ CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
+# CONFIG_NFS_USE_NEW_IDMAPPER is not set
# CONFIG_NFSD is not set
CONFIG_LOCKD=y
CONFIG_LOCKD_V4=y
@@ -2017,8 +2102,6 @@ CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=y
CONFIG_SUNRPC_GSS=y
CONFIG_RPCSEC_GSS_KRB5=y
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
-# CONFIG_SMB_FS is not set
# CONFIG_CEPH_FS is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
@@ -2086,7 +2169,6 @@ CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
-# CONFIG_DLM is not set
#
# Kernel hacking
@@ -2102,20 +2184,28 @@ CONFIG_DEBUG_FS=y
# CONFIG_HEADERS_CHECK is not set
# CONFIG_DEBUG_KERNEL is not set
# CONFIG_HARDLOCKUP_DETECTOR is not set
+CONFIG_BKL=y
+# CONFIG_SPARSE_RCU_POINTER is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_MEMORY_INIT is not set
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_LKDTM is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_RING_BUFFER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_STRICT_DEVMEM is not set
CONFIG_ARM_UNWIND=y
# CONFIG_DEBUG_USER is not set
# CONFIG_OC_ETM is not set
@@ -2125,6 +2215,7 @@ CONFIG_ARM_UNWIND=y
#
CONFIG_KEYS=y
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
# CONFIG_SECURITY is not set
# CONFIG_SECURITYFS is not set
CONFIG_DEFAULT_SECURITY_DAC=y
@@ -2226,6 +2317,8 @@ CONFIG_CRYPTO_LZO=y
# Random Number Generation
#
# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
# CONFIG_CRYPTO_HW is not set
# CONFIG_BINARY_PRINTF is not set
@@ -2246,8 +2339,11 @@ CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
+# CONFIG_XZ_DEC is not set
+# CONFIG_XZ_DEC_BCJ is not set
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_NLATTR=y
CONFIG_GENERIC_ATOMIC64=y
+CONFIG_AVERAGE=y
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
deleted file mode 100644
index 28753b9..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/348-armadeus-plat-mxc-gpio-mxc_gpio_set_behaviour_change.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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);
- }
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/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
deleted file mode 100644
index 7994052..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/359-armadeus-joystick-adding_as5011_joystick_driver.patch
+++ /dev/null
@@ -1,434 +0,0 @@
-Adding Austria Microsystem AS5011 joystick driver
-
-Signed-off-by: Fabien Marteau <fab...@ar...>
-
-Index: linux-2.6.36/drivers/input/joystick/as5011.c
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/drivers/input/joystick/as5011.c 2011-01-11 09:58:15.000000000 +0100
-@@ -0,0 +1,368 @@
-+/*
-+ * Copyright (c) 2010, 2011 Fabien Marteau <fab...@ar...>
-+ * Sponsored by ARMadeus Systems
-+ *
-+ * 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
-+ *
-+ * Driver for Austria Microsystems joysticks AS5011
-+ *
-+ * TODO:
-+ * - Power on the chip when open() and power down when close()
-+ * - Manage power mode
-+ */
-+
-+#include <linux/i2c.h>
-+#include <linux/interrupt.h>
-+#include <linux/input.h>
-+#include <linux/gpio.h>
-+#include <linux/delay.h>
-+#include <linux/input/as5011.h>
-+#include <linux/slab.h>
-+
-+#define DRIVER_DESC "Driver for Austria Microsystems AS5011 joystick"
-+#define MODULE_DEVICE_ALIAS "as5011"
-+
-+MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");
-+MODULE_DESCRIPTION(DRIVER_DESC);
-+MODULE_LICENSE("GPL");
-+
-+/* registers */
-+#define AS5011_CTRL1 0x76
-+#define AS5011_CTRL2 0x75
-+#define AS5011_XP 0x43
-+#define AS5011_XN 0x44
-+#define AS5011_YP 0x53
-+#define AS5011_YN 0x54
-+#define AS5011_X_REG 0x41
-+#define AS5011_Y_REG 0x42
-+#define AS5011_X_RES_INT 0x51
-+#define AS5011_Y_RES_INT 0x52
-+
-+/* CTRL1 bits */
-+#define AS5011_CTRL1_LP_PULSED 0x80
-+#define AS5011_CTRL1_LP_ACTIVE 0x40
-+#define AS5011_CTRL1_LP_CONTINUE 0x20
-+#define AS5011_CTRL1_INT_WUP_EN 0x10
-+#define AS5011_CTRL1_INT_ACT_EN 0x08
-+#define AS5011_CTRL1_EXT_CLK_EN 0x04
-+#define AS5011_CTRL1_SOFT_RST 0x02
-+#define AS5011_CTRL1_DATA_VALID 0x01
-+
-+/* CTRL2 bits */
-+#define AS5011_CTRL2_EXT_SAMPLE_EN 0x08
-+#define AS5011_CTRL2_RC_BIAS_ON 0x04
-+#define AS5011_CTRL2_INV_SPINNING 0x02
-+
-+#define AS5011_MAX_AXIS 80
-+#define AS5011_MIN_AXIS (-80)
-+#define AS5011_FUZZ 8
-+#define AS5011_FLAT 40
-+
-+struct as5011_device {
-+ struct input_dev *input_dev;
-+ struct i2c_client *i2c_client;
-+ unsigned int button_gpio;
-+ unsigned int button_irq;
-+ unsigned int axis_irq;
-+};
-+
-+static int as5011_i2c_write(struct i2c_client *client,
-+ uint8_t aregaddr,
-+ uint8_t avalue)
-+{
-+ uint8_t data[2] = { aregaddr, avalue };
-+ struct i2c_msg msg = {
-+ client->addr, I2C_M_IGNORE_NAK, 2, (uint8_t *)data
-+ };
-+ int error;
-+
-+ error = i2c_transfer(client->adapter, &msg, 1);
-+ return error < 0 ? error : 0;
-+}
-+
-+static int as5011_i2c_read(struct i2c_client *client,
-+ uint8_t aregaddr, signed char *value)
-+{
-+ uint8_t data[2] = { aregaddr };
-+ struct i2c_msg msg_set[2] = {
-+ { client->addr, I2C_M_REV_DIR_ADDR, 1, (uint8_t *)data },
-+ { client->addr, I2C_M_RD | I2C_M_NOSTART, 1, (uint8_t *)data }
-+ };
-+ int error;
-+
-+ error = i2c_transfer(client->adapter, msg_set, 2);
-+ if (error < 0)
-+ return error;
-+
-+ *value = data[0] & 0x80 ? -1 * (1 + ~data[0]) : data[0];
-+ return 0;
-+}
-+
-+static irqreturn_t as5011_button_interrupt(int irq, void *dev_id)
-+{
-+ struct as5011_device *as5011 = dev_id;
-+ int val = gpio_get_value_cansleep(as5011->button_gpio);
-+
-+ input_report_key(as5011->input_dev, BTN_JOYSTICK, !val);
-+ input_sync(as5011->input_dev);
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static irqreturn_t as5011_axis_interrupt(int irq, void *dev_id)
-+{
-+ struct as5011_device *as5011 = dev_id;
-+ int error;
-+ signed char x, y;
-+
-+ error = as5011_i2c_read(as5011->i2c_client, AS5011_X_RES_INT, &x);
-+ if (error < 0)
-+ goto out;
-+
-+ error = as5011_i2c_read(as5011->i2c_client, AS5011_Y_RES_INT, &y);
-+ if (error < 0)
-+ goto out;
-+
-+ input_report_abs(as5011->input_dev, ABS_X, x);
-+ input_report_abs(as5011->input_dev, ABS_Y, y);
-+ input_sync(as5011->input_dev);
-+
-+out:
-+ return IRQ_HANDLED;
-+}
-+
-+static int __devinit as5011_configure_chip(struct as5011_device *as5011,
-+ const struct as5011_platform_data *plat_dat)
-+{
-+ struct i2c_client *client = as5011->i2c_client;
-+ int error;
-+ signed char value;
-+
-+ /* chip soft reset */
-+ error = as5011_i2c_write(client, AS5011_CTRL1,
-+ AS5011_CTRL1_SOFT_RST);
-+ if (error < 0) {
-+ dev_err(&client->dev, "Soft reset failed\n");
-+ return error;
-+ }
-+
-+ mdelay(10);
-+
-+ error = as5011_i2c_write(client, AS5011_CTRL1,
-+ AS5011_CTRL1_LP_PULSED |
-+ AS5011_CTRL1_LP_ACTIVE |
-+ AS5011_CTRL1_INT_ACT_EN);
-+ if (error < 0) {
-+ dev_err(&client->dev, "Power config failed\n");
-+ return error;
-+ }
-+
-+ error = as5011_i2c_write(client, AS5011_CTRL2,
-+ AS5011_CTRL2_INV_SPINNING);
-+ if (error < 0) {
-+ dev_err(&client->dev, "Can't invert spinning\n");
-+ return error;
-+ }
-+
-+ /* write threshold */
-+ error = as5011_i2c_write(client, AS5011_XP, plat_dat->xp);
-+ if (error < 0) {
-+ dev_err(&client->dev, "Can't write threshold\n");
-+ return error;
-+ }
-+
-+ error = as5011_i2c_write(client, AS5011_XN, plat_dat->xn);
-+ if (error < 0) {
-+ dev_err(&client->dev, "Can't write threshold\n");
-+ return error;
-+ }
-+
-+ error = as5011_i2c_write(client, AS5011_YP, plat_dat->yp);
-+ if (error < 0) {
-+ dev_err(&client->dev, "Can't write threshold\n");
-+ return error;
-+ }
-+
-+ error = as5011_i2c_write(client, AS5011_YN, plat_dat->yn);
-+ if (error < 0) {
-+ dev_err(&client->dev, "Can't write threshold\n");
-+ return error;
-+ }
-+
-+ /* to free irq gpio in chip */
-+ error = as5011_i2c_read(client, AS5011_X_RES_INT, &value);
-+ if (error < 0) {
-+ dev_err(&client->dev, "Can't read i2c X resolution value\n");
-+ return error;
-+ }
-+
-+ return 0;
-+}
-+
-+static int __devinit as5011_probe(struct i2c_client *client,
-+ const struct i2c_device_id *id)
-+{
-+ const struct as5011_platform_data *plat_data;
-+ struct as5011_device *as5011;
-+ struct input_dev *input_dev;
-+ int irq;
-+ int error;
-+
-+ plat_data = client->dev.platform_data;
-+ if (!plat_data)
-+ return -EINVAL;
-+
-+ if (!plat_data->axis_irq) {
-+ dev_err(&client->dev, "No axis IRQ?\n");
-+ return -EINVAL;
-+ }
-+
-+ if (!i2c_check_functionality(client->adapter,
-+ I2C_FUNC_PROTOCOL_MANGLING)) {
-+ dev_err(&client->dev,
-+ "need i2c bus that supports protocol mangling\n");
-+ return -ENODEV;
-+ }
-+
-+ as5011 = kmalloc(sizeof(struct as5011_device), GFP_KERNEL);
-+ input_dev = input_allocate_device();
-+ if (!as5011 || !input_dev) {
-+ dev_err(&client->dev,
-+ "Can't allocate memory for device structure\n");
-+ error = -ENOMEM;
-+ goto err_free_mem;
-+ }
-+
-+ as5011->i2c_client = client;
-+ as5011->input_dev = input_dev;
-+ as5011->button_gpio = plat_data->button_gpio;
-+ as5011->axis_irq = plat_data->axis_irq;
-+
-+ input_dev->name = "Austria Microsystem as5011 joystick";
-+ input_dev->id.bustype = BUS_I2C;
-+ input_dev->dev.parent = &client->dev;
-+
-+ __set_bit(EV_KEY, input_dev->evbit);
-+ __set_bit(EV_ABS, input_dev->evbit);
-+ __set_bit(BTN_JOYSTICK, input_dev->keybit);
-+
-+ input_set_abs_params(input_dev, ABS_X,
-+ AS5011_MIN_AXIS, AS5011_MAX_AXIS, AS5011_FUZZ, AS5011_FLAT);
-+ input_set_abs_params(as5011->input_dev, ABS_Y,
-+ AS5011_MIN_AXIS, AS5011_MAX_AXIS, AS5011_FUZZ, AS5011_FLAT);
-+
-+ error = gpio_request(as5011->button_gpio, "AS5011 button");
-+ if (error < 0) {
-+ dev_err(&client->dev, "Failed to request button gpio\n");
-+ goto err_free_mem;
-+ }
-+
-+ irq = gpio_to_irq(as5011->button_gpio);
-+ if (irq < 0) {
-+ dev_err(&client->dev,
-+ "Failed to get irq number for button gpio\n");
-+ goto err_free_button_gpio;
-+ }
-+
-+ as5011->button_irq = irq;
-+
-+ error = request_threaded_irq(as5011->button_irq,
-+ NULL, as5011_button_interrupt,
-+ IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-+ "as5011_button", as5011);
-+ if (error < 0) {
-+ dev_err(&client->dev,
-+ "Can't allocate button irq %d\n", as5011->button_irq);
-+ goto err_free_button_gpio;
-+ }
-+
-+ error = as5011_configure_chip(as5011, plat_data);
-+ if (error)
-+ goto err_free_button_irq;
-+
-+ error = request_threaded_irq(as5011->axis_irq, NULL,
-+ as5011_axis_interrupt,
-+ plat_data->axis_irqflags,
-+ "as5011_joystick", as5011);
-+ if (error) {
-+ dev_err(&client->dev,
-+ "Can't allocate axis irq %d\n", plat_data->axis_irq);
-+ goto err_free_button_irq;
-+ }
-+
-+ error = input_register_device(as5011->input_dev);
-+ if (error) {
-+ dev_err(&client->dev, "Failed to register input device\n");
-+ goto err_free_axis_irq;
-+ }
-+
-+ i2c_set_clientdata(client, as5011);
-+
-+ return 0;
-+
-+err_free_axis_irq:
-+ free_irq(as5011->axis_irq, as5011);
-+err_free_button_irq:
-+ free_irq(as5011->button_irq, as5011);
-+err_free_button_gpio:
-+ gpio_free(as5011->button_gpio);
-+err_free_mem:
-+ input_free_device(input_dev);
-+ kfree(as5011);
-+
-+ return error;
-+}
-+
-+static int __devexit as5011_remove(struct i2c_client *client)
-+{
-+ struct as5011_device *as5011 = i2c_get_clientdata(client);
-+
-+ free_irq(as5011->axis_irq, as5011);
-+ free_irq(as5011->button_irq, as5011);
-+ gpio_free(as5011->button_gpio);
-+
-+ input_unregister_device(as5011->input_dev);
-+ kfree(as5011);
-+
-+ return 0;
-+}
-+
-+static const struct i2c_device_id as5011_id[] = {
-+ { MODULE_DEVICE_ALIAS, 0 },
-+ { }
-+};
-+MODULE_DEVICE_TABLE(i2c, as5011_id);
-+
-+static struct i2c_driver as5011_driver = {
-+ .driver = {
-+ .name = "as5011",
-+ },
-+ .probe = as5011_probe,
-+ .remove = __devexit_p(as5011_remove),
-+ .id_table = as5011_id,
-+};
-+
-+static int __init as5011_init(void)
-+{
-+ return i2c_add_driver(&as5011_driver);
-+}
-+module_init(as5011_init);
-+
-+static void __exit as5011_exit(void)
-+{
-+ i2c_del_driver(&as5011_driver);
-+}
-+module_exit(as5011_exit);
-+
-Index: linux-2.6.36/drivers/input/joystick/Kconfig
-===================================================================
---- linux-2.6.36.orig/drivers/input/joystick/Kconfig 2011-01-11 09:57:28.000000000 +0100
-+++ linux-2.6.36/drivers/input/joystick/Kconfig 2011-01-11 09:58:15.000000000 +0100
-@@ -255,6 +255,15 @@
- To compile this driver as a module, choose M here: the
- module will be called amijoy.
-
-+config JOYSTICK_AS5011
-+ tristate "Austria Microsystem AS5011 joystick"
-+ depends on I2C
-+ help
-+ Say Y here if you have an AS5011 digital joystick.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called as5011.
-+
- config JOYSTICK_JOYDUMP
- tristate "Gameport data dumper"
- select GAMEPORT
-Index: linux-2.6.36/drivers/input/joystick/Makefile
-===================================================================
---- linux-2.6.36.orig/drivers/input/joystick/Makefile 2011-01-11 09:57:28.000000000 +0100
-+++ linux-2.6.36/drivers/input/joystick/Makefile 2011-01-11 09:58:15.000000000 +0100
-@@ -7,6 +7,7 @@
- obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
- obj-$(CONFIG_JOYSTICK_ADI) += adi.o
- obj-$(CONFIG_JOYSTICK_AMIGA) += amijoy.o
-+obj-$(CONFIG_JOYSTICK_AS5011) += as5011.o
- obj-$(CONFIG_JOYSTICK_ANALOG) += analog.o
- obj-$(CONFIG_JOYSTICK_COBRA) += cobra.o
- obj-$(CONFIG_JOYSTICK_DB9) += db9.o
-Index: linux-2.6.36/include/linux/input/as5011.h
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/include/linux/input/as5011.h 2011-01-11 09:58:50.000000000 +0100
-@@ -0,0 +1,20 @@
-+#ifndef _AS5011_H
-+#define _AS5011_H
-+
-+/*
-+ * Copyright (c) 2010, 2011 Fabien Marteau <fab...@ar...>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published by
-+ * the Free Software Foundation.
-+ */
-+
-+struct as5011_platform_data {
-+ unsigned int button_gpio;
-+ unsigned int axis_irq; /* irq number */
-+ unsigned long axis_irqflags;
-+ char xp, xn; /* threshold for x axis */
-+ char yp, yn; /* threshold for y axis */
-+};
-+
-+#endif /* _AS5011_H */
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/015-armadeus-logo-add_armadeus-project_tux.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/015-armadeus-logo-add_armadeus-project_tux.patch
similarity index 100%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/015-armadeus-logo-add_armadeus-project_tux.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/015-armadeus-logo-add_armadeus-project_tux.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/021-armadeus-apf9328.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
similarity index 97%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/021-armadeus-apf9328.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
index e2104b0..02a964c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/021-armadeus-apf9328.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/021-armadeus-apf9328.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.36/arch/arm/mach-imx/apf9328.c
+Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf9328.c 2011-01-11 19:33:04.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328.c 2011-02-07 09:30:20.000000000 +0100
@@ -0,0 +1,587 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
@@ -590,10 +590,10 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf9328.c
+ .timer = &apf9328_timer,
+ .init_machine = apf9328_init,
+MACHINE_END
-Index: linux-2.6.36/arch/arm/mach-imx/apf9328_lcd_config.h
+Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf9328_lcd_config.h 2011-01-11 19:25:49.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328_lcd_config.h 2011-02-07 11:01:05.000000000 +0100
@@ -0,0 +1,329 @@
+/*
+ *
@@ -618,12 +618,12 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf9328_lcd_config.h
+#include <mach/imxfb.h>
+#ifdef CONFIG_ARCH_MX1
+# include <mach/mx1.h>
-+# define LCDC_BASE_ADDR MX1_LCDC_BASE_ADDR
-+# define MXC_IO_ADDRESS MX1_IO_ADDRESS
++# define LCDC_BASE_ADDR MX1_LCDC_BASE_ADDR
++# define MXC_IO_ADDRESS MX1_IO_ADDRESS
+#else
+# include <mach/mx2x.h>
-+# define LCDC_BASE_ADDR MX2x_LCDC_BASE_ADDR
-+# define MXC_IO_ADDRESS(x) (IMX_IO_ADDRESS(x, MX2x_AIPI))
++# define LCDC_BASE_ADDR MX27_LCDC_BASE_ADDR
++# define MXC_IO_ADDRESS MX27_IO_ADDRESS
+#endif
+
+#define LCDISR_EOF (1 << 1)
@@ -924,10 +924,10 @@ Index: linux-2.6.36/arch/arm/mach-imx/apf9328_lcd_config.h
+#endif /* CONFIG_FB_IMX */
+
+#endif /* APF_LCD_CONFIG_H */
-Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/board-apf9328.h
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/plat-mxc/include/mach/board-apf9328.h 2011-01-11 10:22:59.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/board-apf9328.h 2011-02-07 09:30:20.000000000 +0100
@@ -0,0 +1,71 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
@@ -1000,10 +1000,10 @@ Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/board-apf9328.h
+#endif
+
+#endif /* __ASM_ARCH_APF9328_H */
-Index: linux-2.6.36/arch/arm/mach-imx/apf9328-dev.c
+Index: linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.36/arch/arm/mach-imx/apf9328-dev.c 2011-01-11 19:37:25.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-imx/apf9328-dev.c 2011-02-07 09:30:20.000000000 +0100
@@ -0,0 +1,325 @@
+/*
+ * apf9328-dev.c
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/023-armadeus-fblcd-kconfig.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/023-armadeus-fblcd-kconfig.patch
similarity index 100%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/023-armadeus-fblcd-kconfig.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/023-armadeus-fblcd-kconfig.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/024-armadeus-apf9328-add_board_to_linux_build_system.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/024-armadeus-apf9328-add_board_to_linux_build_system.patch
similarity index 100%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/024-armadeus-apf9328-add_board_to_linux_build_system.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/024-armadeus-apf9328-add_board_to_linux_build_system.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/029-armadeus-add_csi_and_spi_registers.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/029-armadeus-add_csi_and_spi_registers.patch
similarity index 100%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/029-armadeus-add_csi_and_spi_registers.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/029-armadeus-add_csi_and_spi_registers.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx-devices.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-imx-devices.tofix
similarity index 82%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx-devices.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-imx-devices.tofix
index 164bce2..a00785c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx-devices.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-imx-devices.tofix
@@ -1,13 +1,3 @@
---- a/arch/arm/mach-imx/devices.h 2010-10-20 22:30:22.000000000 +0200
-+++ b/arch/arm/mach-imx/devices.h 2010-11-22 18:44:10.000000000 +0100
-@@ -3,6 +3,7 @@
- extern struct platform_device imx_rtc_device;
- extern struct platform_device imx_wdt_device;
- extern struct platform_device imx_usb_device;
-+extern struct platform_device imx_mmc_device;
- #endif
-
- #if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)
--- a/arch/arm/mach-imx/devices.c 2010-10-20 22:30:22.000000000 +0200
+++ b/arch/arm/mach-imx/devices.c 2010-12-02 18:20:38.000000000 +0100
@@ -45,6 +45,7 @@
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx_udc-change_clk_get.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-imx_udc-change_clk_get.patch
similarity index 100%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/030-armadeus-imx_udc-change_clk_get.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/030-armadeus-imx_udc-change_clk_get.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/037-armadeus-imx_udc-add_printk_when_probed.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/037-armadeus-imx_udc-add_printk_when_probed.patch
similarity index 100%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/037-armadeus-imx_udc-add_printk_when_probed.patch
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/037-armadeus-imx_udc-add_printk_when_probed.patch
diff --git a/buildroot/target/device/armadeus/linux...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2011-02-04 17:18:25
|
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 21cb6bf7af62f31deec11afbafd7a5c546e37234 (commit)
via 64b8e50d9d9982af5dbe5e442fbbf48ca73a8ce8 (commit)
from a040ebfe4a8727d12244c1acbe94ad4a6a80e93b (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 21cb6bf7af62f31deec11afbafd7a5c546e37234
Merge: 64b8e50d9d9982af5dbe5e442fbbf48ca73a8ce8 a040ebfe4a8727d12244c1acbe94ad4a6a80e93b
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 4 18:17:29 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 64b8e50d9d9982af5dbe5e442fbbf48ca73a8ce8
Author: Julien Boibessot <jul...@ar...>
Date: Fri Feb 4 18:17:01 2011 +0100
[LINUX] Moves APF51 to 2.6.38-rc3
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 6 +-
...-alpha.config => apf51-linux-2.6.38-rc3.config} | 0
.../armadeus/apf51/apf51-linux-2.6.38.config | 103 ++++++++---
.../kernel-patches/{2.6.38-alpha => 2.6.38-rc3} | 0
...pengutronix-1-iMX51-add_ipu_clock_support.patch | 187 --------------------
...12-20-pengutronix-2-iMX51-rename_IPU_irqs.patch | 20 --
...2-20-pengutronix-3-Add_a_mfd_IPUv3_driver.patch | 12 +-
...-pengutronix-4-fb-export_fb_mode_fb_table.patch | 16 +-
...engutronix-6-iMX51-Add_IPU_device_support.patch | 8 +-
...-7-iMX51-Allow_to_increase_max_zone_order.patch | 2 +-
...rease_dma_consistent_size_for_IPU_support.patch | 2 +-
...x-9-iMX51-babbage_add_framebuffer_support.patch | 6 +-
.../2.6.38/400-armadeus-add_apf51_module.patch | 135 +++++++--------
.../2.6.38/401-armadeus-fix_clock_tree.patch | 31 ++--
...deus-iomux-mx51-add_USBH2_pins_definition.patch | 56 ------
...ct_some_mx5_regiter_settings_and_comments.patch | 17 +--
...-mx5-devices-add_USBH2_to_list_of_devices.patch | 134 --------------
.../408-armadeus-add_apf51-dev_baseboard.patch | 22 ++--
.../408b-armadeus-add_apf51-proto_baseboard.patch | 28 ++--
...adeus-iomux-mx51-add_I2C2_pins_definition.patch | 22 ---
...fson-mfd-wm831x-Flag_IRQ_as_a_wake_source.patch | 37 ----
..._configuration_of_IRQ_output_in_CMOS_mode.patch | 4 +-
...cknowledgement-of-WM831x-touchscreen-IRQs.patch | 2 +-
.../417-armadeus-input-wm831x-driver_hacks.patch | 10 +-
...ux-mx51-fixes_UART2_TXD_pad_configuration.patch | 15 ++
25 files changed, 228 insertions(+), 647 deletions(-)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-2.6.38-alpha.config => apf51-linux-2.6.38-rc3.config} (100%)
rename buildroot/target/device/armadeus/linux/kernel-patches/{2.6.38-alpha => 2.6.38-rc3} (100%)
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-1-iMX51-add_ipu_clock_support.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-2-iMX51-rename_IPU_irqs.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/409-armadeus-iomux-mx51-add_I2C2_pins_definition.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-wolfson-mfd-wm831x-Flag_IRQ_as_a_wake_source.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/418-armadeus-iomux-mx51-fixes_UART2_TXD_pad_configuration.patch
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index ca497c7..1a1bdce 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Jan 27 17:13:40 2011
+# Thu Feb 3 14:38:43 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -863,8 +863,8 @@ BR2_LINUX_KERNEL=y
# BR2_LINUX_KERNEL_SAME_AS_HEADERS is not set
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
# BR2_LINUX_KERNEL_CUSTOM_TARBALL is not set
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38-alpha"
-BR2_LINUX_KERNEL_VERSION="2.6.38-alpha"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="2.6.38-rc3"
+BR2_LINUX_KERNEL_VERSION="2.6.38-rc3"
BR2_LINUX_KERNEL_PATCH="$(LINUX26_PATCH_DIR)"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38-alpha.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38-rc3.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38-alpha.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38-rc3.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
index c4084d2..61b5e1f 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.38.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 2.6.37-rc4 Kernel Configuration
-# Thu Jan 6 20:07:42 2011
+# Linux/arm 2.6.38-rc3 Kernel Configuration
+# Thu Feb 3 22:16:23 2011
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -9,7 +9,6 @@ CONFIG_GENERIC_GPIO=y
# CONFIG_ARCH_USES_GETTIMEOFFSET is not set
CONFIG_GENERIC_CLOCKEVENTS=y
CONFIG_HAVE_PROC_CPU=y
-CONFIG_GENERIC_HARDIRQS=y
CONFIG_STACKTRACE_SUPPORT=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_LOCKDEP_SUPPORT=y
@@ -17,11 +16,12 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_ARCH_HAS_CPUFREQ=y
CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_FIQ=y
CONFIG_ARM_L1_CACHE_SHIFT_6=y
CONFIG_VECTORS_BASE=0xffff0000
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -53,7 +53,17 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y
# CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
-# CONFIG_HAVE_GENERIC_HARDIRQS is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
+CONFIG_HAVE_SPARSE_IRQ=y
+# CONFIG_GENERIC_PENDING_IRQ is not set
+# CONFIG_AUTO_IRQ_AFFINITY is not set
+# CONFIG_IRQ_PER_CPU is not set
# CONFIG_SPARSE_IRQ is not set
#
@@ -71,12 +81,14 @@ CONFIG_RCU_FANOUT=32
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CGROUPS is not set
# CONFIG_NAMESPACES is not set
+# CONFIG_SCHED_AUTOGROUP is not set
# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
# CONFIG_BLK_DEV_INITRD is not set
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
+CONFIG_EXPERT=y
CONFIG_EMBEDDED=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
@@ -115,6 +127,7 @@ CONFIG_HAVE_KPROBES=y
CONFIG_HAVE_KRETPROBES=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_CLK=y
+CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
#
@@ -194,6 +207,7 @@ CONFIG_MMU=y
# CONFIG_ARCH_EP93XX is not set
# CONFIG_ARCH_FOOTBRIDGE is not set
CONFIG_ARCH_MXC=y
+# CONFIG_ARCH_MXS is not set
# CONFIG_ARCH_STMP3XXX is not set
# CONFIG_ARCH_NETX is not set
# CONFIG_ARCH_H720X is not set
@@ -237,6 +251,8 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP is not set
# CONFIG_PLAT_SPEAR is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
CONFIG_IMX_HAVE_PLATFORM_FEC=y
CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS=y
CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y
@@ -266,6 +282,9 @@ CONFIG_SOC_IMX51=y
# CONFIG_MACH_EUKREA_CPUIMX51 is not set
# CONFIG_MACH_EUKREA_CPUIMX51SD is not set
# CONFIG_MACH_MX51_EFIKAMX is not set
+# CONFIG_MACH_MX53_EVK is not set
+# CONFIG_MACH_MX53_SMD is not set
+# CONFIG_MACH_MX53_LOCO is not set
CONFIG_MACH_APF51=y
CONFIG_MACH_APF51_HAS_BASEBOARD=y
# CONFIG_MACH_APF51_DEV is not set
@@ -299,6 +318,7 @@ CONFIG_CPU_CP15_MMU=y
#
CONFIG_ARM_THUMB=y
CONFIG_ARM_THUMBEE=y
+# CONFIG_SWP_EMULATE is not set
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -309,7 +329,6 @@ CONFIG_CPU_HAS_PMU=y
# CONFIG_ARM_ERRATA_458693 is not set
# CONFIG_ARM_ERRATA_460075 is not set
# CONFIG_ARM_ERRATA_743622 is not set
-CONFIG_COMMON_CLKDEV=y
#
# Bus support
@@ -340,7 +359,6 @@ CONFIG_OABI_COMPAT=y
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
# CONFIG_HIGHMEM is not set
CONFIG_HW_PERF_EVENTS=y
-# CONFIG_SPARSE_IRQ is not set
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FLATMEM=y
@@ -348,6 +366,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_COMPACTION is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=0
CONFIG_VIRT_TO_BUS=y
@@ -369,6 +388,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE=""
# CONFIG_XIP_KERNEL is not set
# CONFIG_KEXEC is not set
+# CONFIG_CRASH_DUMP is not set
# CONFIG_AUTO_ZRELADDR is not set
#
@@ -410,7 +430,6 @@ CONFIG_PM_DEBUG=y
CONFIG_PM_VERBOSE=y
CONFIG_CAN_PM_TRACE=y
CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_NVS=y
CONFIG_SUSPEND=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_SUSPEND_FREEZER=y
@@ -503,6 +522,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_NET_SCHED is not set
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
#
# Network testing
@@ -563,7 +583,6 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
# CONFIG_MAC80211_MESH is not set
-# CONFIG_MAC80211_LEDS is not set
# CONFIG_MAC80211_DEBUGFS is not set
# CONFIG_MAC80211_DEBUG_MENU is not set
# CONFIG_WIMAX is not set
@@ -673,10 +692,6 @@ CONFIG_MTD_NAND_MXC=y
# LPDDR flash memory drivers
#
# CONFIG_MTD_LPDDR is not set
-
-#
-# UBI - Unsorted block images
-#
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_WL_THRESHOLD=4096
CONFIG_MTD_UBI_BEB_RESERVE=1
@@ -780,6 +795,7 @@ CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_OSD_INITIATOR is not set
# CONFIG_ATA is not set
# CONFIG_MD is not set
+# CONFIG_TARGET_CORE is not set
CONFIG_NETDEVICES=y
# CONFIG_DUMMY is not set
# CONFIG_BONDING is not set
@@ -830,7 +846,6 @@ CONFIG_NET_ETHERNET=y
# CONFIG_KS8851 is not set
# CONFIG_KS8851_MLL 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
@@ -861,8 +876,9 @@ CONFIG_RT2X00_LIB=m
CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
# CONFIG_RT2X00_DEBUG is not set
+# CONFIG_RTL8192CE is not set
# CONFIG_WL1251 is not set
-# CONFIG_WL12XX is not set
+# CONFIG_WL12XX_MENU is not set
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
@@ -974,6 +990,7 @@ CONFIG_TOUCHSCREEN_WM831X=m
# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
# CONFIG_TOUCHSCREEN_W90X900 is not set
+# CONFIG_TOUCHSCREEN_ST1232 is not set
# CONFIG_TOUCHSCREEN_TPS6507X is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_AD714X is not set
@@ -988,6 +1005,7 @@ CONFIG_INPUT_UINPUT=m
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
# CONFIG_INPUT_WM831X_ON is not set
# CONFIG_INPUT_ADXL34X is not set
+# CONFIG_INPUT_CMA3000 is not set
#
# Hardware I/O ports
@@ -1029,10 +1047,12 @@ CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_TIMBERDALE is not set
# CONFIG_SERIAL_ALTERA_JTAGUART is not set
# CONFIG_SERIAL_ALTERA_UART is not set
+# CONFIG_SERIAL_IFX6X60 is not set
CONFIG_UNIX98_PTYS=y
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
# CONFIG_LEGACY_PTYS is not set
# CONFIG_TTY_PRINTK is not set
+# CONFIG_HVC_DCC is not set
# CONFIG_IPMI_HANDLER is not set
# CONFIG_HW_RANDOM is not set
# CONFIG_R3964 is not set
@@ -1086,6 +1106,7 @@ CONFIG_SPI_BITBANG=y
CONFIG_SPI_IMX_VER_0_7=y
CONFIG_SPI_IMX_VER_2_3=y
CONFIG_SPI_IMX=y
+# CONFIG_SPI_PXA2XX_PCI is not set
# CONFIG_SPI_XILINX is not set
# CONFIG_SPI_DESIGNWARE is not set
@@ -1099,6 +1120,10 @@ CONFIG_SPI_SPIDEV=m
# PPS support
#
# CONFIG_PPS is not set
+
+#
+# PPS generators support
+#
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
# CONFIG_GPIO_SYSFS is not set
@@ -1108,14 +1133,12 @@ CONFIG_GPIOLIB=y
#
# CONFIG_GPIO_BASIC_MMIO is not set
# CONFIG_GPIO_IT8761E is not set
-# CONFIG_GPIO_VX855 is not set
#
# I2C GPIO expanders:
#
# CONFIG_GPIO_MAX7300 is not set
# CONFIG_GPIO_MAX732X is not set
-# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_SX150X is not set
# CONFIG_GPIO_WM831X is not set
@@ -1151,7 +1174,9 @@ CONFIG_WM831X_POWER=m
# CONFIG_BATTERY_BQ20Z75 is not set
# CONFIG_BATTERY_BQ27x00 is not set
# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_GPIO is not set
CONFIG_HWMON=m
# CONFIG_HWMON_VID is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1174,6 +1199,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_ADT7475 is not set
# CONFIG_SENSORS_ASC7621 is not set
# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS620 is not set
# CONFIG_SENSORS_DS1621 is not set
# CONFIG_SENSORS_F71805F is not set
# CONFIG_SENSORS_F71882FG is not set
@@ -1208,6 +1234,7 @@ CONFIG_HWMON=m
# CONFIG_SENSORS_PC87427 is not set
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_SHT15 is not set
+# CONFIG_SENSORS_SHT21 is not set
# CONFIG_SENSORS_SMM665 is not set
# CONFIG_SENSORS_DME1737 is not set
# CONFIG_SENSORS_EMC1403 is not set
@@ -1270,7 +1297,7 @@ CONFIG_MFD_CORE=y
# CONFIG_TPS6507X is not set
# CONFIG_TWL4030_CORE is not set
# CONFIG_MFD_STMPE is not set
-# CONFIG_MFD_TC35892 is not set
+# CONFIG_MFD_TC3589X is not set
# CONFIG_MFD_TMIO is not set
# CONFIG_MFD_T7L66XB is not set
# CONFIG_MFD_TC6387XB is not set
@@ -1290,6 +1317,7 @@ CONFIG_MFD_WM831X_I2C=y
# CONFIG_ABX500_CORE is not set
# CONFIG_EZX_PCAP is not set
# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_WL1273_CORE is not set
CONFIG_MFD_IMX_IPU_V3=y
# CONFIG_REGULATOR is not set
# CONFIG_MEDIA_SUPPORT is not set
@@ -1313,6 +1341,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
# CONFIG_FB_SYS_IMAGEBLIT is not set
# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_WMT_GE_ROPS is not set
# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
# CONFIG_FB_BACKLIGHT is not set
@@ -1324,6 +1353,7 @@ CONFIG_FB_MODE_HELPERS=y
#
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_TMIO is not set
+# CONFIG_FB_UDL is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
@@ -1370,7 +1400,6 @@ CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_LOGO_ARMADEUS_CLUT224=y
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
@@ -1404,6 +1433,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_SPI is not set
# CONFIG_SND_USB is not set
CONFIG_SND_SOC=m
+# CONFIG_SND_SOC_CACHE_LZO is not set
CONFIG_SND_SOC_AC97_BUS=y
CONFIG_SND_IMX_SOC=m
CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -1435,6 +1465,7 @@ CONFIG_USB_HID=y
# CONFIG_HID_PRODIKEYS is not set
# CONFIG_HID_CYPRESS is not set
# CONFIG_HID_DRAGONRISE is not set
+# CONFIG_HID_EMS_FF is not set
# CONFIG_HID_EGALAX is not set
# CONFIG_HID_ELECOM is not set
# CONFIG_HID_EZKEY is not set
@@ -1449,6 +1480,7 @@ CONFIG_USB_HID=y
# CONFIG_HID_MICROSOFT is not set
# CONFIG_HID_MOSART is not set
# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_MULTITOUCH is not set
# CONFIG_HID_NTRIG is not set
# CONFIG_HID_ORTEK is not set
# CONFIG_HID_PANTHERLORD is not set
@@ -1457,6 +1489,7 @@ CONFIG_USB_HID=y
# CONFIG_HID_QUANTA is not set
# CONFIG_HID_ROCCAT is not set
# CONFIG_HID_ROCCAT_KONE is not set
+# CONFIG_HID_ROCCAT_KONEPLUS is not set
# CONFIG_HID_ROCCAT_PYRA is not set
# CONFIG_HID_SAMSUNG is not set
# CONFIG_HID_SONY is not set
@@ -1572,33 +1605,34 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_YUREX is not set
CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_FSL_USB2=y
CONFIG_USB_FSL_USB2=y
# CONFIG_USB_GADGET_R8A66597 is not set
+# CONFIG_USB_GADGET_PXA_U2O is not set
# CONFIG_USB_GADGET_M66592 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
# CONFIG_USB_AUDIO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_ETH_EEM is not set
+# CONFIG_USB_G_NCM is not set
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FUNCTIONFS is not set
# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_MASS_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
-# CONFIG_USB_CDC_COMPOSITE is not set
+CONFIG_USB_CDC_COMPOSITE=m
# CONFIG_USB_G_MULTI is not set
-# CONFIG_USB_G_HID is not set
+CONFIG_USB_G_HID=m
# CONFIG_USB_G_DBGP is not set
-# CONFIG_USB_G_WEBCAM is not set
#
# OTG and related infrastructure
@@ -1610,6 +1644,7 @@ CONFIG_USB_ULPI=y
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
#
# MMC/SD/SDIO Card Drivers
@@ -1629,9 +1664,11 @@ CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
# CONFIG_MMC_MXC is not set
CONFIG_MMC_SPI=m
+# CONFIG_MMC_DW is not set
# CONFIG_MMC_USHC is not set
# CONFIG_MEMSTICK is not set
# CONFIG_NEW_LEDS is not set
+# CONFIG_NFC_DEVICES is not set
# CONFIG_ACCESSIBILITY is not set
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
@@ -1645,7 +1682,6 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
CONFIG_RTC_INTF_SYSFS=y
CONFIG_RTC_INTF_PROC=y
CONFIG_RTC_INTF_DEV=y
-# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
# CONFIG_RTC_DRV_TEST is not set
#
@@ -1707,6 +1743,7 @@ CONFIG_RTC_DRV_WM831X=m
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_STAGING is not set
+CONFIG_CLKDEV_LOOKUP=y
#
# File systems
@@ -1728,12 +1765,11 @@ CONFIG_JBD=y
CONFIG_FS_MBCACHE=y
# CONFIG_REISERFS_FS is not set
# CONFIG_JFS_FS is not set
-CONFIG_FS_POSIX_ACL=y
# CONFIG_XFS_FS is not set
# CONFIG_GFS2_FS is not set
-# CONFIG_OCFS2_FS is not set
# CONFIG_BTRFS_FS is not set
# CONFIG_NILFS2_FS is not set
+CONFIG_FS_POSIX_ACL=y
CONFIG_FILE_LOCKING=y
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
@@ -1903,7 +1939,6 @@ CONFIG_NLS_ISO8859_1=y
# CONFIG_NLS_KOI8_R is not set
# CONFIG_NLS_KOI8_U is not set
# CONFIG_NLS_UTF8 is not set
-# CONFIG_DLM is not set
#
# Kernel hacking
@@ -1927,13 +1962,16 @@ CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_LKDTM is not set
# CONFIG_SYSCTL_SYSCALL_CHECK is not set
CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
CONFIG_RING_BUFFER=y
CONFIG_RING_BUFFER_ALLOW_SWAP=y
CONFIG_TRACING_SUPPORT=y
# CONFIG_FTRACE is not set
# CONFIG_DYNAMIC_DEBUG is not set
+# CONFIG_DMA_API_DEBUG is not set
# CONFIG_ATOMIC64_SELFTEST is not set
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
@@ -2049,6 +2087,8 @@ CONFIG_CRYPTO_LZO=y
# Random Number Generation
#
# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_USER_API_HASH is not set
+# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
# CONFIG_CRYPTO_HW is not set
# CONFIG_BINARY_PRINTF is not set
@@ -2069,7 +2109,10 @@ CONFIG_ZLIB_INFLATE=y
CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
+# CONFIG_XZ_DEC is not set
+# CONFIG_XZ_DEC_BCJ is not set
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_NLATTR=y
+CONFIG_AVERAGE=y
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-alpha b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-rc3
similarity index 100%
rename from buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-alpha
rename to buildroot/target/device/armadeus/linux/kernel-patches/2.6.38-rc3
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-1-iMX51-add_ipu_clock_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-1-iMX51-add_ipu_clock_support.patch
deleted file mode 100644
index 4b1856b..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-1-iMX51-add_ipu_clock_support.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-Signed-off-by: Sascha Hauer <s....@pe...>
----
- arch/arm/mach-mx5/clock-mx51-mx53.c | 140 +++++++++++++++++++++++++++++++++++
- 1 files changed, 140 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c
-index 9fc65bb..f550d02 100644
---- a/arch/arm/mach-mx5/clock-mx51-mx53.c
-+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
-@@ -39,6 +39,9 @@ static struct clk periph_apm_clk;
- static struct clk ahb_clk;
- static struct clk ipg_clk;
- static struct clk usboh3_clk;
-+static struct clk emi_fast_clk;
-+static struct clk ipu_clk;
-+static struct clk mipi_hsc1_clk;
-
- #define MAX_DPLL_WAIT_TRIES 1000 /* 1000 * udelay(1) = 1ms */
-
-@@ -688,6 +691,19 @@ static unsigned long clk_emi_slow_get_rate(struct clk *clk)
- return clk_get_rate(clk->parent) / div;
- }
-
-+static unsigned long _clk_ddr_hf_get_rate(struct clk *clk)
-+{
-+ unsigned long rate;
-+ u32 reg, div;
-+
-+ reg = __raw_readl(MXC_CCM_CBCDR);
-+ div = ((reg & MXC_CCM_CBCDR_DDR_PODF_MASK) >>
-+ MXC_CCM_CBCDR_DDR_PODF_OFFSET) + 1;
-+ rate = clk_get_rate(clk->parent) / div;
-+
-+ return rate;
-+}
-+
- /* External high frequency clock */
- static struct clk ckih_clk = {
- .get_rate = get_high_reference_clock_rate,
-@@ -846,6 +862,109 @@ static struct clk emi_slow_clk = {
- .get_rate = clk_emi_slow_get_rate,
- };
-
-+static int clk_ipu_enable(struct clk *clk)
-+{
-+ u32 reg;
-+
-+ _clk_ccgr_enable(clk);
-+
-+ /* Enable handshake with IPU when certain clock rates are changed */
-+ reg = __raw_readl(MXC_CCM_CCDR);
-+ reg &= ~MXC_CCM_CCDR_IPU_HS_MASK;
-+ __raw_writel(reg, MXC_CCM_CCDR);
-+
-+ /* Enable handshake with IPU when LPM is entered */
-+ reg = __raw_readl(MXC_CCM_CLPCR);
-+ reg &= ~MXC_CCM_CLPCR_BYPASS_IPU_LPM_HS;
-+ __raw_writel(reg, MXC_CCM_CLPCR);
-+
-+ return 0;
-+}
-+
-+static void clk_ipu_disable(struct clk *clk)
-+{
-+ u32 reg;
-+
-+ _clk_ccgr_disable(clk);
-+
-+ /* Disable handshake with IPU whe dividers are changed */
-+ reg = __raw_readl(MXC_CCM_CCDR);
-+ reg |= MXC_CCM_CCDR_IPU_HS_MASK;
-+ __raw_writel(reg, MXC_CCM_CCDR);
-+
-+ /* Disable handshake with IPU when LPM is entered */
-+ reg = __raw_readl(MXC_CCM_CLPCR);
-+ reg |= MXC_CCM_CLPCR_BYPASS_IPU_LPM_HS;
-+ __raw_writel(reg, MXC_CCM_CLPCR);
-+}
-+
-+static struct clk ahbmux1_clk = {
-+ .parent = &ahb_clk,
-+ .secondary = &ahb_max_clk,
-+ .enable_reg = MXC_CCM_CCGR0,
-+ .enable_shift = MXC_CCM_CCGRx_CG8_OFFSET,
-+ .enable = _clk_ccgr_enable,
-+ .disable = _clk_ccgr_disable_inwait,
-+};
-+
-+static struct clk ipu_sec_clk = {
-+ .parent = &emi_fast_clk,
-+ .secondary = &ahbmux1_clk,
-+};
-+
-+static struct clk ddr_hf_clk = {
-+ .parent = &pll1_sw_clk,
-+ .get_rate = _clk_ddr_hf_get_rate,
-+};
-+
-+static struct clk ddr_clk = {
-+ .parent = &ddr_hf_clk,
-+};
-+
-+/* clock definitions for MIPI HSC unit which has been removed
-+ * from documentation, but not from hardware
-+ */
-+static int _clk_hsc_enable(struct clk *clk)
-+{
-+ u32 reg;
-+
-+ _clk_ccgr_enable(clk);
-+ /* Handshake with IPU when certain clock rates are changed. */
-+ reg = __raw_readl(MXC_CCM_CCDR);
-+ reg &= ~MXC_CCM_CCDR_HSC_HS_MASK;
-+ __raw_writel(reg, MXC_CCM_CCDR);
-+
-+ reg = __raw_readl(MXC_CCM_CLPCR);
-+ reg &= ~MXC_CCM_CLPCR_BYPASS_HSC_LPM_HS;
-+ __raw_writel(reg, MXC_CCM_CLPCR);
-+
-+ return 0;
-+}
-+
-+static void _clk_hsc_disable(struct clk *clk)
-+{
-+ u32 reg;
-+
-+ _clk_ccgr_disable(clk);
-+ /* No handshake with HSC as its not enabled. */
-+ reg = __raw_readl(MXC_CCM_CCDR);
-+ reg |= MXC_CCM_CCDR_HSC_HS_MASK;
-+ __raw_writel(reg, MXC_CCM_CCDR);
-+
-+ reg = __raw_readl(MXC_CCM_CLPCR);
-+ reg |= MXC_CCM_CLPCR_BYPASS_HSC_LPM_HS;
-+ __raw_writel(reg, MXC_CCM_CLPCR);
-+}
-+
-+static struct clk mipi_hsp_clk = {
-+ .parent = &ipu_clk,
-+ .enable_reg = MXC_CCM_CCGR4,
-+ .enable_shift = MXC_CCM_CCGRx_CG6_OFFSET,
-+ .enable = _clk_hsc_enable,
-+ .disable = _clk_hsc_disable,
-+ .secondary = &mipi_hsc1_clk,
-+};
-+
- #define DEFINE_CLOCK_CCGR(name, i, er, es, pfx, p, s) \
- static struct clk name = { \
- .id = i, \
-@@ -1077,6 +1196,23 @@ DEFINE_CLOCK_FULL(esdhc2_ipg_clk, 1, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG2_OFFSET,
- DEFINE_CLOCK_MAX(esdhc2_clk, 1, MXC_CCM_CCGR3, MXC_CCM_CCGRx_CG3_OFFSET,
- clk_esdhc2, &pll2_sw_clk, &esdhc2_ipg_clk);
-
-+DEFINE_CLOCK(mipi_esc_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG5_OFFSET, NULL, NULL, NULL, &pll2_sw_clk);
-+DEFINE_CLOCK(mipi_hsc2_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG4_OFFSET, NULL, NULL, &mipi_esc_clk, &pll2_sw_clk);
-+DEFINE_CLOCK(mipi_hsc1_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG3_OFFSET, NULL, NULL, &mipi_hsc2_clk, &pll2_sw_clk);
-+
-+/* IPU */
-+DEFINE_CLOCK_FULL(ipu_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG5_OFFSET,
-+ NULL, NULL, clk_ipu_enable, clk_ipu_disable, &ahb_clk, &ipu_sec_clk);
-+
-+DEFINE_CLOCK_FULL(emi_fast_clk, 0, MXC_CCM_CCGR5, MXC_CCM_CCGRx_CG7_OFFSET,
-+ NULL, NULL, _clk_ccgr_enable, _clk_ccgr_disable_inwait,
-+ &ddr_clk, NULL);
-+
-+DEFINE_CLOCK(ipu_di0_clk, 0, MXC_CCM_CCGR6, MXC_CCM_CCGRx_CG5_OFFSET,
-+ NULL, NULL, &pll3_sw_clk, NULL);
-+DEFINE_CLOCK(ipu_di1_clk, 0, MXC_CCM_CCGR6, MXC_CCM_CCGRx_CG6_OFFSET,
-+ NULL, NULL, &pll3_sw_clk, NULL);
-+
- #define _REGISTER_CLOCK(d, n, c) \
- { \
- .dev_id = d, \
-@@ -1117,6 +1253,10 @@ static struct clk_lookup mx51_lookups[] = {
- _REGISTER_CLOCK(NULL, "iim_clk", iim_clk)
- _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk)
- _REGISTER_CLOCK("imx2-wdt.1", NULL, dummy_clk)
-+ _REGISTER_CLOCK(NULL, "mipi_hsp", mipi_hsp_clk)
-+ _REGISTER_CLOCK("imx-ipuv3", NULL, ipu_clk)
-+ _REGISTER_CLOCK("imx-ipuv3", "di0", ipu_di0_clk)
-+ _REGISTER_CLOCK("imx-ipuv3", "di1", ipu_di1_clk)
- };
-
- static struct clk_lookup mx53_lookups[] = {
---
-1.7.2.3
-
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-2-iMX51-rename_IPU_irqs.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-2-iMX51-rename_IPU_irqs.patch
deleted file mode 100644
index f7e6edb..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-2-iMX51-rename_IPU_irqs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Signed-off-by: Sascha Hauer <s....@pe...>
----
- arch/arm/plat-mxc/include/mach/mx51.h | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/plat-mxc/include/mach/mx51.h b/arch/arm/plat-mxc/include/mach/mx51.h
-index fa3a2a5..873807f 100644
---- a/arch/arm/plat-mxc/include/mach/mx51.h
-+++ b/arch/arm/plat-mxc/include/mach/mx51.h
-@@ -251,8 +251,8 @@
- #define MX51_MXC_INT_IOMUX 7
- #define MX51_INT_NFC 8
- #define MX51_MXC_INT_VPU 9
--#define MX51_MXC_INT_IPU_ERR 10
--#define MX51_MXC_INT_IPU_SYN 11
-+#define MX51_INT_IPU_ERR 10
-+#define MX51_INT_IPU_SYN 11
- #define MX51_MXC_INT_GPU 12
- #define MX51_MXC_INT_RESV13 13
- #define MX51_MXC_INT_USB_H1 14
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-3-Add_a_mfd_IPUv3_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-3-Add_a_mfd_IPUv3_driver.patch
index 68429d6..49bcd3d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-3-Add_a_mfd_IPUv3_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-3-Add_a_mfd_IPUv3_driver.patch
@@ -111,9 +111,9 @@ diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 3a1493b..3c81879 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
-@@ -606,6 +606,13 @@ config MFD_VX855
- VIA VX855/VX875 south bridge. You will need to enable the vx855_spi
- and/or vx855_gpio drivers for this to do anything useful.
+@@ -624,6 +624,13 @@ config MFD_VX855
+ driver connects the radio-wl1273 V4L2 module and the wl1273
+ audio codec.
+config MFD_IMX_IPU_V3
+ tristate "Support the Image Processing Unit (IPU) found on the i.MX51"
@@ -129,10 +129,10 @@ diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index f54b365..7873b13 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
-@@ -81,3 +81,4 @@ obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o
- obj-$(CONFIG_MFD_JZ4740_ADC) += jz4740-adc.o
- obj-$(CONFIG_MFD_TPS6586X) += tps6586x.o
+@@ -83,3 +83,4 @@ obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o
obj-$(CONFIG_MFD_VX855) += vx855.o
+ obj-$(CONFIG_MFD_WL1273_CORE) += wl1273-core.o
+ obj-$(CONFIG_MFD_CS5535) += cs5535-mfd.o
+obj-$(CONFIG_MFD_IMX_IPU_V3) += imx-ipu-v3/
diff --git a/drivers/mfd/imx-ipu-v3/Makefile b/drivers/mfd/imx-ipu-v3/Makefile
new file mode 100644
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-4-fb-export_fb_mode_fb_table.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-4-fb-export_fb_mode_fb_table.patch
index 449243c..fc64be1 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-4-fb-export_fb_mode_fb_table.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-4-fb-export_fb_mode_fb_table.patch
@@ -17,11 +17,11 @@ index 0a4dbdc..82122a9 100644
-static const struct fb_videomode modedb[] = {
+const struct fb_videomode modedb[] = {
- {
+
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
- NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2,
-@@ -277,6 +277,11 @@ static const struct fb_videomode modedb[] = {
- },
+ { NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2, 0,
+@@ -291,6 +291,11 @@ static const struct fb_videomode modedb[] = {
+ 0, FB_VMODE_NONINTERLACED },
};
+const struct fb_videomode *fb_modes = modedb;
@@ -30,15 +30,15 @@ index 0a4dbdc..82122a9 100644
+EXPORT_SYMBOL(num_fb_modes);
+
#ifdef CONFIG_FB_MODE_HELPERS
- const struct fb_videomode vesa_modes[] = {
- /* 0 640x350-85 VESA */
+ const struct fb_videomode cea_modes[64] = {
+ /* #1: 640x480p@59.94/60Hz */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index d1631d3..e006172 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
-@@ -1151,6 +1151,9 @@ struct fb_videomode {
- extern const char *fb_mode_option;
+@@ -1154,6 +1154,9 @@ struct fb_videomode {
extern const struct fb_videomode vesa_modes[];
+ extern const struct fb_videomode cea_modes[64];
+extern const struct fb_videomode *fb_modes;
+extern const int num_fb_modes;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-6-iMX51-Add_IPU_device_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-6-iMX51-Add_IPU_device_support.patch
index 59251fb..9985a4a 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-6-iMX51-Add_IPU_device_support.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-6-iMX51-Add_IPU_device_support.patch
@@ -12,10 +12,10 @@ diff --git a/arch/arm/mach-mx5/devices-imx51.h b/arch/arm/mach-mx5/devices-imx51
index 6302e46..851c114 100644
--- a/arch/arm/mach-mx5/devices-imx51.h
+++ b/arch/arm/mach-mx5/devices-imx51.h
-@@ -47,3 +47,7 @@ extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
- extern const struct imx_imx2_wdt_data imx51_imx2_wdt_data[] __initconst;
- #define imx51_add_imx2_wdt(id, pdata) \
- imx_add_imx2_wdt(&imx51_imx2_wdt_data[id])
+@@ -55,3 +55,7 @@ extern const struct imx_spi_imx_data imx51_ecspi_data[] __initconst;
+ extern const struct imx_imx_keypad_data imx51_imx_keypad_data __initconst;
+ #define imx51_add_imx_keypad(pdata) \
+ imx_add_imx_keypad(&imx51_imx_keypad_data, pdata)
+
+extern const struct imx_ipuv3_data imx51_ipuv3_data __initconst;
+#define imx51_add_ipuv3(pdata) \
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-7-iMX51-Allow_to_increase_max_zone_order.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-7-iMX51-Allow_to_increase_max_zone_order.patch
index 6b36b41..c7a946c 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-7-iMX51-Allow_to_increase_max_zone_order.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-7-iMX51-Allow_to_increase_max_zone_order.patch
@@ -12,7 +12,7 @@ diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index db524e7..b3e070e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1410,8 +1410,8 @@ config SPARSE_IRQ
+@@ -1451,8 +1451,8 @@ config SPARSE_IRQ
source "mm/Kconfig"
config FORCE_MAX_ZONEORDER
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-8-iMX51-increase_dma_consistent_size_for_IPU_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-8-iMX51-increase_dma_consistent_size_for_IPU_support.patch
index 94115e7..18d74ba 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-8-iMX51-increase_dma_consistent_size_for_IPU_support.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-8-iMX51-increase_dma_consistent_size_for_IPU_support.patch
@@ -7,7 +7,7 @@ diff --git a/arch/arm/plat-mxc/include/mach/memory.h b/arch/arm/plat-mxc/include
index 9a9a000..987b42a 100644
--- a/arch/arm/plat-mxc/include/mach/memory.h
+++ b/arch/arm/plat-mxc/include/mach/memory.h
-@@ -40,7 +40,8 @@
+@@ -43,7 +43,8 @@
# endif
#endif
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-9-iMX51-babbage_add_framebuffer_support.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-9-iMX51-babbage_add_framebuffer_support.patch
index 93f438e..9f715c9 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-9-iMX51-babbage_add_framebuffer_support.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/001-2010-12-20-pengutronix-9-iMX51-babbage_add_framebuffer_support.patch
@@ -8,7 +8,7 @@ diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index 5011f42..2a936b7 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
-@@ -22,6 +22,7 @@ config MACH_MX51_BABBAGE
+@@ -42,6 +42,7 @@ config MACH_MX51_BABBAGE
select IMX_HAVE_PLATFORM_IMX_UART
select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX
select IMX_HAVE_PLATFORM_SPI_IMX
@@ -36,8 +36,8 @@ index 368a315..6c1576c 100644
#include <asm/setup.h>
@@ -158,6 +160,41 @@ static iomux_v3_cfg_t mx51babbage_pads[] = {
MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK,
- MX51_PAD_CSPI1_SS0__GPIO_4_24,
- MX51_PAD_CSPI1_SS1__GPIO_4_25,
+ MX51_PAD_CSPI1_SS0__GPIO4_24,
+ MX51_PAD_CSPI1_SS1__GPIO4_25,
+
+ /* Display */
+ MX51_PAD_DISPB2_SER_DIN__GPIO_3_5,
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index df005d8..1b5bde5 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,10 +1,10 @@
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
+Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-21 09:27:13.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-21 09:58:04.000000000 +0100
-@@ -101,4 +101,17 @@
- Include support for Genesi Efika MX nettop. This includes specific
- configurations for the board and its peripherals.
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Kconfig 2011-02-03 17:17:35.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/Kconfig 2011-02-04 09:33:17.000000000 +0100
+@@ -162,4 +162,17 @@
+ Include support for MX50 reference design platform (RDP) board. This
+ includes specific configurations for the board and its peripherals.
+config MACH_APF51
+ bool "Support Armadeus APF51"
@@ -20,23 +20,23 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
+ includes specific configurations for the board and its peripherals.
+
endif
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
+Index: linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-21 09:58:04.000000000 +0100
-@@ -6,6 +6,7 @@
- obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/Makefile 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/Makefile 2011-02-04 09:33:17.000000000 +0100
+@@ -7,6 +7,7 @@
+ obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
+obj-$(CONFIG_MACH_APF51) += board-apf51.o
obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o
obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
- obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ obj-$(CONFIG_MACH_MX53_EVK) += board-mx53_evk.o
+Index: linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c 2011-01-21 09:43:53.000000000 +0100
-@@ -0,0 +1,423 @@
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/board-apf51.c 2011-02-04 09:23:58.000000000 +0100
+@@ -0,0 +1,418 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus Systems
@@ -121,55 +121,46 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ MX51_PAD_EIM_D23__USBH2_DATA7,
+
+ /* FEC */
-+ MX51_PAD_EIM_EB2__FEC_MDIO,
-+ MX51_PAD_EIM_EB3__FEC_RDAT1,
-+ MX51_PAD_EIM_CS2__FEC_RDAT2,
-+ MX51_PAD_EIM_CS3__FEC_RDAT3,
-+ MX51_PAD_EIM_CS4__FEC_RX_ER,
-+ MX51_PAD_EIM_CS5__FEC_CRS,
-+ MX51_PAD_NANDF_RB2__FEC_COL,
-+ MX51_PAD_NANDF_RB3__FEC_RXCLK,
-+ MX51_PAD_NANDF_RB6__FEC_RDAT0,
-+ MX51_PAD_NANDF_RB7__FEC_TDAT0,
-+ MX51_PAD_NANDF_CS2__FEC_TX_ER,
-+ MX51_PAD_NANDF_CS3__FEC_MDC,
-+ MX51_PAD_NANDF_CS4__FEC_TDAT1,
-+ MX51_PAD_NANDF_CS5__FEC_TDAT2,
-+ MX51_PAD_NANDF_CS6__FEC_TDAT3,
-+ MX51_PAD_NANDF_CS7__FEC_TX_EN,
-+ MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK,
++ MX51_PAD_DI_GP3__FEC_TX_ER,
++ MX51_PAD_DI2_PIN4__FEC_CRS,
++ MX51_PAD_DI2_PIN2__FEC_MDC,
++ MX51_PAD_DI2_PIN3__FEC_MDIO,
++ MX51_PAD_DI2_DISP_CLK__FEC_RDATA1,
++ MX51_PAD_DI_GP4__FEC_RDATA2,
++ MX51_PAD_DISP2_DAT0__FEC_RDATA3,
++ MX51_PAD_DISP2_DAT1__FEC_RX_ER,
++ MX51_PAD_DISP2_DAT6__FEC_TDATA1,
++ MX51_PAD_DISP2_DAT7__FEC_TDATA2,
++ MX51_PAD_DISP2_DAT8__FEC_TDATA3,
++ MX51_PAD_DISP2_DAT9__FEC_TX_EN,
++ MX51_PAD_DISP2_DAT10__FEC_COL,
++ MX51_PAD_DISP2_DAT11__FEC_RX_CLK,
++ MX51_PAD_DISP2_DAT12__FEC_RX_DV,
++ MX51_PAD_DISP2_DAT13__FEC_TX_CLK,
++ MX51_PAD_DISP2_DAT14__FEC_RDATA0,
++ MX51_PAD_DISP2_DAT15__FEC_TDATA0,
+
+ /* FEC PHY reset line */
-+ MX51_PAD_DI1_PIN11__GPIO_3_0,
++ MX51_PAD_DI1_PIN11__GPIO3_0,
+
+ /* I2C2 */
+ MX51_PAD_EIM_D24__I2C2_SDA,
+ MX51_PAD_EIM_D27__I2C2_SCL,
+
+ /* WM8311 IRQ */
-+ MX51_PAD_GPIO_1_7__GPIO_1_7,
++ MX51_PAD_GPIO1_7__GPIO1_7,
+ /* WM8311 TOUCH_DETECT */
-+ MX51_PAD_GPIO_1_4__GPIO_1_4,
++ MX51_PAD_GPIO1_4__GPIO1_4,
+ /* WM8311 TOUCH_EOC */
-+ MX51_PAD_GPIO_1_6__GPIO_1_6,
++ MX51_PAD_GPIO1_6__GPIO1_6,
+};
+
++
+/* Serial ports */
-+#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
+static struct imxuart_platform_data uart_pdata = {
-+// .flags = IMXUART_HAVE_RTSCTS,
++ .flags = 0, /*IMXUART_HAVE_RTSCTS,*/
+};
+
-+static inline void apf51_init_imx_uart(void)
-+{
-+ imx51_add_imx_uart(1, &uart_pdata);
-+}
-+#else /* !SERIAL_IMX */
-+static inline void apf51_init_imx_uart(void)
-+{
-+}
-+#endif /* SERIAL_IMX */
-+
+
+/* APF51 has a 512MB+ 3,3V Micron NAND flash, 8 bits width */
+static const struct mxc_nand_platform_data apf51_nand_board_info __initconst = {
@@ -232,17 +223,17 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+
+static int apf51_usbh1_usbh2_active(void)
+{
-+ iomux_v3_cfg_t phyreset_gpio = MX51_PAD_DI1_PIN12__GPIO_3_1;
++ iomux_v3_cfg_t phyreset_gpio = MX51_PAD_DI1_PIN12__GPIO3_1;
+ int ret;
+#if 0
-+ iomux_v3_cfg_t usbh1stp_gpio = MX51_PAD_USBH1_STP__GPIO_1_27;
++ iomux_v3_cfg_t usbh1stp_gpio = MX51_PAD_USBH1_STP__GPIO1_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);
++ pr_debug("failed to get MX51_PAD_USBH1_STP__GPIO1_27: %d\n", ret);
+ return ret;
+ }
+ gpio_direction_output(APF51_USBH1_STP, 0);
@@ -252,11 +243,11 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+#endif
+
+ /* De-assert USB PHY RESETB */
-+ mxc_iomux_v3_setup_pad(&phyreset_gpio);
++ 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);
++ pr_debug("failed to get MX51_PAD_DI1_PIN12__GPIO3_1: %d\n", ret);
+ return ret;
+ }
+ gpio_direction_output(APF51_USB_HOST_PHY_RESET, 1);
@@ -290,6 +281,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ __raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
+ iounmap(usb_base);
+
++ printk("--- initialize_otg_port\n");
+ return 0;
+}
+
@@ -321,7 +313,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+
+#if 0
+/* Done in U-Boot, kept here just in case... ;-) */
-+#define APF51_FEC_PHY_RESET (2*32+0) /* GPIO_3_0 */
++#define APF51_FEC_PHY_RESET (2*32+0) /* GPIO3_0 */
+static inline void apf51_fec_reset(void)
+{
+ int ret;
@@ -344,9 +336,9 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ .bitrate = 400000,
+};
+
-+#define APF51_WM8311_IRQ_GPIO (0*32 + 7) /* GPIO_1_7 */
-+#define APF51_WM8311_TOUCH_DETECT_GPIO (0*32 + 4) /* GPIO_1_4 */
-+#define APF51_WM8311_TOUCH_EOC_GPIO (0*32 + 6) /* GPIO_1_6 */
++#define APF51_WM8311_IRQ_GPIO (0*32 + 7) /* GPIO1_7 */
++#define APF51_WM8311_TOUCH_DETECT_GPIO (0*32 + 4) /* GPIO1_4 */
++#define APF51_WM8311_TOUCH_EOC_GPIO (0*32 + 6) /* GPIO1_6 */
+
+static int apf51_wm8311_pre_init(struct wm831x *wm831x)
+{
@@ -417,7 +409,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ mxc_iomux_v3_setup_multiple_pads(apf51_pads,
+ ARRAY_SIZE(apf51_pads));
+
-+ apf51_init_imx_uart();
++ imx51_add_imx_uart(1, &uart_pdata);
+
+ imx51_add_imx_i2c(1, &apf51_i2c_data);
+ i2c_register_board_info(1, apf51_i2c1_devices, ARRAY_SIZE(apf51_i2c1_devices));
@@ -430,12 +422,15 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ apf51_usbh1_usbh2_active();
+ mxc_register_device(&mxc_usbh1_device, &usbh1_config);
+ mxc_register_device(&mxc_usbh2_device, &usbh2_config);
++#if 0
++ /* Currently system boot freezes when OTG is activated :-( */
+ if (otg_mode_host)
+ mxc_register_device(&mxc_usbdr_host_device, &apf51_usbdr_host_config);
+ else {
+ initialize_otg_port(NULL);
+ mxc_register_device(&mxc_usbdr_udc_device, &apf51_usbdr_device_pdata);
+ }
++#endif
+
+#ifdef CONFIG_MACH_APF51_HAS_BASEBOARD
+ apf51_baseboard_init();
@@ -460,21 +455,21 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+ .timer = &apf51_timer,
+MACHINE_END
+
-Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h 2011-01-21 09:27:13.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/uncompress.h 2011-02-03 17:17:35.000000000 +0100
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
#define MX51_UART1_BASE_ADDR 0x73fbc000
+#define MX51_UART2_BASE_ADDR 0x73fc0000
+ #define MX50_UART1_BASE_ADDR 0x53fbc000
+ #define MX53_UART1_BASE_ADDR 0x53fbc000
- static __inline__ void __arch_decomp_setup(unsigned long arch_id)
- {
-@@ -102,6 +103,9 @@
- case MACH_TYPE_EUKREA_CPUIMX51SD:
- uart_base = MX51_UART1_BASE_ADDR;
+@@ -110,6 +111,9 @@
+ case MACH_TYPE_MX53_EVK:
+ uart_base = MX53_UART1_BASE_ADDR;
break;
+ case MACH_TYPE_APF51:
+ uart_base = MX51_UART2_BASE_ADDR;
@@ -482,11 +477,11 @@ Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h
default:
break;
}
-Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/irqs.h 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h 2011-01-21 09:27:13.000000000 +0100
-@@ -47,6 +47,8 @@
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-01 04:05:49.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/include/mach/irqs.h 2011-02-03 17:17:35.000000000 +0100
+@@ -51,6 +51,8 @@
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
#define MXC_BOARD_IRQS 80
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/401-armadeus-fix_clock_tree.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/401-armadeus-fix_clock_tree.patch
index e3f2636..81abdcf 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/401-armadeus-fix_clock_tree.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/401-armadeus-fix_clock_tree.patch
@@ -5,11 +5,11 @@ Patch has to be reworked to dynamically do that switch.
Signed-off-by: Nicolas Colombain <nic...@ar...>
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/clock-mx51-mx53.c
+Index: linux-2.6.38-rc3/arch/arm/mach-mx5/clock-mx51-mx53.c
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2010-12-29 10:34:04.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/clock-mx51-mx53.c 2010-12-29 10:35:10.000000000 +0100
-@@ -1322,7 +1322,7 @@
+--- linux-2.6.38-rc3.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-02-03 17:38:54.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/mach-mx5/clock-mx51-mx53.c 2011-02-03 17:39:05.000000000 +0100
+@@ -1399,7 +1399,7 @@
clk_set_rate(&esdhc2_clk, 166250000);
/* System timer */
@@ -18,10 +18,10 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/clock-mx51-mx53.c
MX51_MXC_INT_GPT);
return 0;
}
-Index: linux-2.6.38-alpha/arch/arm/plat-mxc/time.c
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/time.c
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/time.c 2010-12-29 10:33:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/time.c 2010-12-29 10:35:10.000000000 +0100
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/time.c 2011-02-03 17:38:54.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/time.c 2011-02-03 17:39:06.000000000 +0100
@@ -56,6 +56,7 @@
/* MX31, MX35, MX25, MXC91231, MX5 */
#define V2_TCTL_WAITEN (1 << 3) /* Wait enable mode */
@@ -30,25 +30,16 @@ Index: linux-2.6.38-alpha/arch/arm/plat-mxc/time.c
#define V2_TCTL_FRR (1 << 9)
#define V2_IR 0x0c
#define V2_TSTAT 0x08
-@@ -120,7 +121,7 @@
- .rating = 200,
- .read = mx1_2_get_cycles,
- .mask = CLOCKSOURCE_MASK(32),
-- .shift = 20,
-+ .shift = 10, /* kHz */
- .flags = CLOCK_SOURCE_IS_CONTINUOUS,
- };
+@@ -132,6 +133,8 @@
-@@ -135,6 +136,8 @@
- clocksource_mxc.shift);
- clocksource_register(&clocksource_mxc);
+ clocksource_register_hz(&clocksource_mxc, c);
+ printk("___%s %dkHz mult=%d\n", __func__, c, clocksource_mxc.mult);
+
return 0;
}
-@@ -285,6 +288,7 @@
+@@ -282,6 +285,7 @@
clockevent_mxc.min_delta_ns =
clockevent_delta2ns(0xff, &clockevent_mxc);
@@ -56,7 +47,7 @@ Index: linux-2.6.38-alpha/arch/arm/plat-mxc/time.c
clockevent_mxc.cpumask = cpumask_of(0);
clockevents_register_device(&clockevent_mxc);
-@@ -308,7 +312,8 @@
+@@ -305,7 +309,8 @@
__raw_writel(0, timer_base + MXC_TPRER); /* see datasheet note */
if (timer_is_v2())
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch
deleted file mode 100644
index bb78777..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/405-armadeus-iomux-mx51-add_USBH2_pins_definition.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Declare USBH2 pins in IOMUX.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/iomux-mx51.h
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/iomux-mx51.h 2010-12-29 10:33:52.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/iomux-mx51.h 2010-12-29 10:35:31.000000000 +0100
-@@ -45,6 +45,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)
- #define MX51_GPIO_PAD_CTRL_2 (PAD_CTL_SRE_FAST | PAD_CTL_DSE_HIGH | \
-@@ -86,17 +87,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)
-@@ -116,9 +125,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.38/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch
index e0df8fd..dd30443 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/406-armadeus-plat-mxc-ehci-correct_some_mx5_regiter_settings_and_comments.patch
@@ -5,19 +5,12 @@ 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.38-alpha/arch/arm/plat-mxc/ehci.c
+Index: linux-2.6.38-rc3/arch/arm/plat-mxc/ehci.c
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/ehci.c 2010-12-29 10:33:52.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/ehci.c 2010-12-29 10:35:35.000000000 +0100
-@@ -296,14 +296,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 */
+--- linux-2.6.38-rc3.orig/arch/arm/plat-mxc/ehci.c 2011-02-03 17:38:54.000000000 +0100
++++ linux-2.6.38-rc3/arch/arm/plat-mxc/ehci.c 2011-02-03 17:39:20.000000000 +0100
+@@ -320,9 +320,9 @@
+ }
if (flags & MXC_EHCI_POWER_PINS_ENABLED)
- v &= ~MXC_H1_UCTRL_H1PM_BIT; /* HOST1 power mask used*/
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch
deleted file mode 100644
index af1f7d1..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/407-armadeus-mx5-devices-add_USBH2_to_list_of_devices.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Add USBH2 in the list of MX5 devices.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/devices.c
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/devices.c 2010-12-29 10:33:52.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/devices.c 2010-12-29 10:35:40.000000000 +0100
-@@ -97,6 +97,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_kpp_resources[] = {
- {
- .start = MX51_MXC_INT_KPP,
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/devices.h
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/devices.h 2010-12-29 10:33:51.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/devices.h 2010-12-29 10:35:40.000000000 +0100
-@@ -1,5 +1,6 @@
- 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_hsi2c_device;
- extern struct platform_device mxc_keypad_device;
-Index: linux-2.6.38-alpha/arch/arm/mach-mx5/clock-mx51-mx53.c
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/clock-mx51-mx53.c 2010-12-29 10:35:10.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/clock-mx51-mx53.c 2010-12-29 10:35:40.000000000 +0100
-@@ -1233,6 +1233,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.38-alpha/arch/arm/plat-mxc/ehci.c
-===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/ehci.c 2010-12-29 10:35:35.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/ehci.c 2010-12-29 10:35:40.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_H1...
[truncated message content] |
|
From: jorasse <jo...@us...> - 2011-02-03 23:46:18
|
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 a040ebfe4a8727d12244c1acbe94ad4a6a80e93b (commit)
via 14ae256decfe5ea48b8e92e2185801858f79ac9a (commit)
from 8b31f3229f7789295dbb874f39f06846eebea069 (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 a040ebfe4a8727d12244c1acbe94ad4a6a80e93b
Merge: 14ae256decfe5ea48b8e92e2185801858f79ac9a 8b31f3229f7789295dbb874f39f06846eebea069
Author: Eric Jarrige <eri...@ar...>
Date: Fri Feb 4 00:53:55 2011 +0100
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 14ae256decfe5ea48b8e92e2185801858f79ac9a
Author: Eric Jarrige <eri...@ar...>
Date: Fri Feb 4 00:49:43 2011 +0100
[UBOOT] Set NAND and SD outputs to high voltage
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 22 +++---
...boot-2010.03-411-Fix-high-voltage-nand-sd.patch | 93 ++++++++++++++++++++
2 files changed, 104 insertions(+), 11 deletions(-)
create mode 100644 buildroot/target/u-boot/u-boot-2010.03-411-Fix-high-voltage-nand-sd.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 f694e6b..dc10f3a 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
@@ -891,12 +891,12 @@
#define CONFIG_IOMUX_PAD_DRAM_DQM3 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU \
+PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
-#define CONFIG_IOMUX_PAD_EIM_SDBA2 PAD_CTL_DRV_VOT_HIGH+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
- +PAD_CTL_100K_PU /* imx default */
-#define CONFIG_IOMUX_PAD_EIM_SDODT1 PAD_CTL_DRV_VOT_HIGH+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
- +PAD_CTL_100K_PD+PAD_CTL_DRV_LOW+PAD_CTL_SRE_FAST /* imx default */
-#define CONFIG_IOMUX_PAD_EIM_SDODT0 PAD_CTL_DRV_VOT_HIGH+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
- +PAD_CTL_100K_PD+PAD_CTL_DRV_LOW+PAD_CTL_SRE_FAST /* imx default */
+#define CONFIG_IOMUX_PAD_EIM_SDBA2 PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+ +PAD_CTL_100K_PU
+#define CONFIG_IOMUX_PAD_EIM_SDODT1 PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+ +PAD_CTL_100K_PD+PAD_CTL_DRV_LOW+PAD_CTL_SRE_FAST
+#define CONFIG_IOMUX_PAD_EIM_SDODT0 PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+ +PAD_CTL_100K_PD+PAD_CTL_DRV_LOW+PAD_CTL_SRE_FAST
#define CONFIG_IOMUX_GRP_DDRPKS PAD_CTL_PUE_PULL /* imx default */
#define CONFIG_IOMUX_GRP_DRAM_B4 PAD_CTL_DRV_HIGH /* imx default */
@@ -908,7 +908,7 @@
#define CONFIG_IOMUX_GRP_HYSDDR0 PAD_CTL_HYS_NONE /* imx default */
#define CONFIG_IOMUX_GRP_HYSDDR1 PAD_CTL_HYS_NONE /* imx default */
#define CONFIG_IOMUX_GRP_HYSDDR2 PAD_CTL_HYS_NONE /* imx default */
-#define CONFIG_IOMUX_GRP_HVDDR PAD_CTL_DRV_VOT_HIGH /* imx default */
+#define CONFIG_IOMUX_GRP_HVDDR PAD_CTL_DRV_VOT_LOW
#define CONFIG_IOMUX_GRP_HYSDDR3 PAD_CTL_HYS_NONE /* imx default */
#define CONFIG_IOMUX_GRP_DRAM_SR_B0 PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_GRP_DDRAPKS PAD_CTL_PUE_PULL /* imx default */
@@ -989,10 +989,10 @@
#define CONFIG_IOMUX_PAD_DRAM_DQM2 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU+PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
#define CONFIG_IOMUX_PAD_DRAM_DQM3 PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU+PAD_CTL_DRV_HIGH+PAD_CTL_SRE_SLOW
-#define CONFIG_IOMUX_PAD_EIM_SDBA2 PAD_CTL_DRV_VOT_HIGH+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU /* imx default */
-#define CONFIG_IOMUX_PAD_EIM_SDODT1 PAD_CTL_DRV_VOT_HIGH+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+#define CONFIG_IOMUX_PAD_EIM_SDBA2 PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL+PAD_CTL_100K_PU
+#define CONFIG_IOMUX_PAD_EIM_SDODT1 PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+PAD_CTL_100K_PD+PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST
-#define CONFIG_IOMUX_PAD_EIM_SDODT0 PAD_CTL_DRV_VOT_HIGH+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+#define CONFIG_IOMUX_PAD_EIM_SDODT0 PAD_CTL_DRV_VOT_LOW+PAD_CTL_PKE_ENABLE+PAD_CTL_PUE_PULL \
+PAD_CTL_100K_PD+PAD_CTL_DRV_HIGH+PAD_CTL_SRE_FAST
#define CONFIG_IOMUX_GRP_DDRPKS PAD_CTL_PUE_KEEPER
@@ -1005,7 +1005,7 @@
#define CONFIG_IOMUX_GRP_HYSDDR0 PAD_CTL_HYS_NONE
#define CONFIG_IOMUX_GRP_HYSDDR1 PAD_CTL_HYS_NONE
#define CONFIG_IOMUX_GRP_HYSDDR2 PAD_CTL_HYS_NONE
-#define CONFIG_IOMUX_GRP_HVDDR PAD_CTL_DRV_VOT_HIGH
+#define CONFIG_IOMUX_GRP_HVDDR PAD_CTL_DRV_VOT_LOW
#define CONFIG_IOMUX_GRP_HYSDDR3 PAD_CTL_HYS_NONE
#define CONFIG_IOMUX_GRP_DRAM_SR_B0 PAD_CTL_SRE_FAST
#define CONFIG_IOMUX_GRP_DDRAPKS PAD_CTL_PUE_PULL
diff --git a/buildroot/target/u-boot/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch b/buildroot/target/u-boot/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch
new file mode 100644
index 0000000..1a62b78
--- /dev/null
+++ b/buildroot/target/u-boot/u-boot-2010.03-411-Fix-high-voltage-nand-sd.patch
@@ -0,0 +1,93 @@
+diff -purN u-boot-2010.03.ori/board/armadeus/apf51/apf51.c u-boot-2010.03/board/armadeus/apf51/apf51.c
+--- u-boot-2010.03.ori/board/armadeus/apf51/apf51.c 2011-01-25 22:43:23.000000000 +0100
++++ u-boot-2010.03/board/armadeus/apf51/apf51.c 2011-02-04 00:21:21.000000000 +0100
+@@ -513,22 +513,61 @@ void setup_nfc(void)
+ /*
+ * Configure iomux for NFC interface
+ */
++#define NAND_PAD47K_CFG (PAD_CTL_DRV_VOT_HIGH | PAD_CTL_HYS_NONE | \
++ PAD_CTL_PKE_ENABLE | PAD_CTL_47K_PU | \
++ PAD_CTL_DRV_HIGH)
++
++#define NAND_PAD100K_CFG (PAD_CTL_DRV_VOT_HIGH | PAD_CTL_HYS_NONE | \
++ PAD_CTL_PKE_ENABLE | PAD_CTL_100K_PU | \
++ PAD_CTL_DRV_HIGH)
++
+ mxc_request_iomux(MX51_PIN_NANDF_WE_B, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_WE_B, NAND_PAD47K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_RE_B, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_RE_B, NAND_PAD47K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_ALE , IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_ALE , NAND_PAD47K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_CLE , IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_CLE , NAND_PAD47K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_WP_B, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_WP_B, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_RB0 , IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_RB0 , PAD_CTL_DRV_VOT_HIGH |
++ PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |
++ PAD_CTL_PUE_PULL | PAD_CTL_100K_PU);
++
+ mxc_request_iomux(MX51_PIN_NANDF_CS0, IOMUX_CONFIG_ALT0);
+
++ /* MX51_PIN_NANDF_RDY_INT */
++
+ mxc_request_iomux(MX51_PIN_NANDF_D0, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D0, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D1, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D1, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D2, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D2, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D3, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D3, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D4, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D4, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D5, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D5, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D6, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D6, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D7, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D7, NAND_PAD100K_CFG);
+
+ writel(0, NFC_IPC);
+ NFC_SET_FW(1);
+diff -purN u-boot-2010.03.ori/include/asm-arm/arch-mx51/asm-offsets.h u-boot-2010.03/include/asm-arm/arch-mx51/asm-offsets.h
+--- u-boot-2010.03.ori/include/asm-arm/arch-mx51/asm-offsets.h 2011-01-25 22:43:22.000000000 +0100
++++ u-boot-2010.03/include/asm-arm/arch-mx51/asm-offsets.h 2011-02-03 23:08:33.000000000 +0100
+@@ -176,7 +176,7 @@
+ #define PAD_CTL_HYS_ENABLE (0x1 << 8) /* Hysteresis enabled */
+ #define PAD_CTL_DDR_INPUT_CMOS (0x0 << 9)/* DDR input CMOS */
+ #define PAD_CTL_DDR_INPUT_DDR (0x1 << 9)/* DDR input DDR */
+-#define PAD_CTL_DRV_VOT_LOW (0x0 << 13) /* Low voltage mode */
+-#define PAD_CTL_DRV_VOT_HIGH (0x1 << 13)/* High voltage mode */
++#define PAD_CTL_DRV_VOT_HIGH (0x0 << 13) /* High voltage mode */
++#define PAD_CTL_DRV_VOT_LOW (0x1 << 13)/* Low voltage mode */
+
+ #endif /* __ASSEMBLY__ */
+diff -purN u-boot-2010.03.ori/include/asm-arm/arch-mx51/iomux.h u-boot-2010.03/include/asm-arm/arch-mx51/iomux.h
+--- u-boot-2010.03.ori/include/asm-arm/arch-mx51/iomux.h 2010-03-31 23:54:39.000000000 +0200
++++ u-boot-2010.03/include/asm-arm/arch-mx51/iomux.h 2011-02-03 23:08:48.000000000 +0100
+@@ -66,8 +66,8 @@ typedef enum iomux_pad_config {
+ PAD_CTL_HYS_ENABLE = 0x1 << 8, /* Hysteresis enabled */
+ PAD_CTL_DDR_INPUT_CMOS = 0x0 << 9,/* DDR input CMOS */
+ PAD_CTL_DDR_INPUT_DDR = 0x1 << 9,/* DDR input DDR */
+- PAD_CTL_DRV_VOT_LOW = 0x0 << 13, /* Low voltage mode */
+- PAD_CTL_DRV_VOT_HIGH = 0x1 << 13,/* High voltage mode */
++ PAD_CTL_DRV_VOT_HIGH = 0x0 << 13, /* High voltage mode */
++ PAD_CTL_DRV_VOT_LOW = 0x1 << 13,/* Low voltage mode */
+ } iomux_pad_config_t;
+
+ /* various IOMUX input select register index */
+
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-02-03 10:50:40
|
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 8b31f3229f7789295dbb874f39f06846eebea069 (commit)
via 667f3afd1059d49318b2dfabdb21e7c41bccc036 (commit)
via 4992ef7ba3dd955c629cc0ca0cf2d3040fe0a404 (commit)
via cbf0278fc3d671a396e7d2cdf5705ab596eea5e4 (commit)
from ced35ab65fe24be471ab73e56ce862ebae6c0fa1 (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 8b31f3229f7789295dbb874f39f06846eebea069
Merge: 667f3afd1059d49318b2dfabdb21e7c41bccc036 ced35ab65fe24be471ab73e56ce862ebae6c0fa1
Author: Fabien Marteau <fab...@ar...>
Date: Thu Feb 3 11:50:20 2011 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 667f3afd1059d49318b2dfabdb21e7c41bccc036
Author: Fabien Marteau <fab...@ar...>
Date: Thu Feb 3 11:50:03 2011 +0100
[linux][spidev] Check if platform pointer is null before initialization in probe()
commit 4992ef7ba3dd955c629cc0ca0cf2d3040fe0a404
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jan 31 16:31:55 2011 +0100
[linux] Clean i2c-imx patch according to checkpatches.pl rules (bis)
commit cbf0278fc3d671a396e7d2cdf5705ab596eea5e4
Author: Fabien Marteau <fab...@ar...>
Date: Mon Jan 31 16:16:45 2011 +0100
[linux] Clean i2c-imx patch according to checkpatches.pl rules
-----------------------------------------------------------------------
Summary of changes:
...-add_platform_data_init_support_to_spidev.patch | 11 ++--
...ing_mangling_capability_on_i2c_imx_driver.patch | 77 +++++---------------
2 files changed, 24 insertions(+), 64 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
index 9b412f4..2844554 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/339-apf27-armadeus-add_platform_data_init_support_to_spidev.patch
@@ -7,7 +7,7 @@ Signed-off-by: Gwenhaël Goavec-Merou <gw...@tr...>
Index: linux-2.6.36/drivers/spi/spidev.c
===================================================================
--- 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
++++ linux-2.6.36/drivers/spi/spidev.c 2011-02-03 11:42:13.000000000 +0100
@@ -560,6 +560,7 @@
static int __devinit spidev_probe(struct spi_device *spi)
@@ -16,13 +16,14 @@ Index: linux-2.6.36/drivers/spi/spidev.c
struct spidev_data *spidev;
int status;
unsigned long minor;
-@@ -597,6 +598,10 @@
+@@ -597,6 +598,11 @@
set_bit(minor, minors);
list_add(&spidev->device_entry, &device_list);
}
+ /* allocate GPIO / IRQ if necessary */
-+ if (pdata->init)
-+ pdata->init();
++ if (pdata != NULL)
++ if (pdata->init)
++ pdata->init();
+
mutex_unlock(&device_list_lock);
@@ -30,7 +31,7 @@ Index: linux-2.6.36/drivers/spi/spidev.c
Index: linux-2.6.36/include/linux/spi/spidev.h
===================================================================
--- 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
++++ linux-2.6.36/include/linux/spi/spidev.h 2011-02-02 11:43:03.000000000 +0100
@@ -103,6 +103,10 @@
*/
};
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
index bec8298..4b0cca6 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/358-armadeus-imx-adding_mangling_capability_on_i2c_imx_driver.patch
@@ -1,53 +1,25 @@
+Adding Mangling capability to i2c imx bus controller.
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+---
Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
===================================================================
--- linux-2.6.36.orig/drivers/i2c/busses/i2c-imx.c 2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36/drivers/i2c/busses/i2c-imx.c 2010-12-29 18:36:16.000000000 +0100
-@@ -34,7 +34,6 @@
-
- /** Includes *******************************************************************
- *******************************************************************************/
--
- #include <linux/init.h>
- #include <linux/kernel.h>
- #include <linux/module.h>
-@@ -214,10 +213,12 @@
- static void i2c_imx_stop(struct imx_i2c_struct *i2c_imx)
- {
- unsigned int temp = 0;
-+ int ret;
-+
-
- if (!i2c_imx->stopped) {
- /* Stop I2C transaction */
-- dev_dbg(&i2c_imx->adapter.dev, "<%s>\n", __func__);
-+ dev_dbg(&i2c_imx->adapter.dev, "<%s>***\n", __func__);
- temp = readb(i2c_imx->base + IMX_I2C_I2CR);
- temp &= ~(I2CR_MSTA | I2CR_MTX);
- writeb(temp, i2c_imx->base + IMX_I2C_I2CR);
-@@ -231,7 +232,9 @@
- }
-
- if (!i2c_imx->stopped) {
-- i2c_imx_bus_busy(i2c_imx, 0);
-+
-+ ret = i2c_imx_bus_busy(i2c_imx, 0);
-+
- i2c_imx->stopped = 1;
- }
-
-@@ -300,17 +303,27 @@
++++ linux-2.6.36/drivers/i2c/busses/i2c-imx.c 2011-01-31 16:23:34.000000000 +0100
+@@ -300,17 +300,28 @@
{
int i, result;
- dev_dbg(&i2c_imx->adapter.dev, "<%s> write slave address: addr=0x%x\n",
- __func__, msgs->addr << 1);
-+ if ( (msgs->flags & I2C_M_NOSTART) == 0) {
++ if ((msgs->flags & I2C_M_NOSTART) == 0) {
+ /* write slave address */
+ if (msgs->flags & I2C_M_REV_DIR_ADDR) {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, msgs->addr << 1 | 0x01);
-+ writeb((msgs->addr << 1) | 0x01, i2c_imx->base + IMX_I2C_I2DR);
++ writeb((msgs->addr << 1) | 0x01,
++ i2c_imx->base + IMX_I2C_I2DR);
+ } else {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
@@ -73,16 +45,16 @@ Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
dev_dbg(&i2c_imx->adapter.dev, "<%s> write data\n", __func__);
/* write data */
-@@ -323,7 +336,7 @@
+@@ -323,7 +334,7 @@
if (result)
return result;
result = i2c_imx_acked(i2c_imx);
- if (result)
-+ if ( (result != 0) && ((msgs[0].flags & I2C_M_IGNORE_NAK) == 0))
++ if ((result != 0) && ((msgs[0].flags & I2C_M_IGNORE_NAK) == 0))
return result;
}
return 0;
-@@ -334,18 +347,26 @@
+@@ -334,18 +345,27 @@
int i, result;
unsigned int temp;
@@ -98,7 +70,7 @@ Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
- result = i2c_imx_acked(i2c_imx);
- if (result)
- return result;
-+ if ( (msgs->flags & I2C_M_NOSTART) == 0) {
++ if ((msgs->flags & I2C_M_NOSTART) == 0) {
+ /* write slave address */
+ if (msgs->flags & I2C_M_REV_DIR_ADDR) {
+ dev_dbg(&i2c_imx->adapter.dev,
@@ -109,7 +81,8 @@ Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, (msgs->addr << 1) | 0x01);
-+ writeb((msgs->addr << 1) | 0x01, i2c_imx->base + IMX_I2C_I2DR);
++ writeb((msgs->addr << 1) | 0x01,
++ i2c_imx->base + IMX_I2C_I2DR);
+ }
+ result = i2c_imx_trx_complete(i2c_imx);
+ if (result)
@@ -121,30 +94,16 @@ Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
dev_dbg(&i2c_imx->adapter.dev, "<%s> setup bus\n", __func__);
-@@ -405,7 +426,7 @@
+@@ -405,7 +425,7 @@
/* read/write data */
for (i = 0; i < num; i++) {
- if (i) {
-+ if (i && ((msgs[i].flags & I2C_M_NOSTART)==0)) {
++ if (i && ((msgs[i].flags & I2C_M_NOSTART) == 0)) {
dev_dbg(&i2c_imx->adapter.dev,
"<%s> repeated start\n", __func__);
temp = readb(i2c_imx->base + IMX_I2C_I2CR);
-@@ -435,9 +456,13 @@
- (temp & I2SR_RXAK ? 1 : 0));
- #endif
- if (msgs[i].flags & I2C_M_RD)
-+ {
- result = i2c_imx_read(i2c_imx, &msgs[i]);
-+ }
- else
-+ {
- result = i2c_imx_write(i2c_imx, &msgs[i]);
-+ }
- if (result)
- goto fail0;
- }
-@@ -454,7 +479,7 @@
+@@ -454,7 +474,7 @@
static u32 i2c_imx_func(struct i2c_adapter *adapter)
{
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-02-03 10:32:16
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ced35ab65fe24be471ab73e56ce862ebae6c0fa1 (commit)
via 80e6a04540264b74fab3b4bc6479858243061f2b (commit)
via 40e399adeeb82caa547db8e6e780438239613dd5 (commit)
via b1ed4f50d04b4d0d86421423d34ef0846defe3f5 (commit)
from 5986c6a5c794a966d7139fec3c1f52841a60a54b (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 ced35ab65fe24be471ab73e56ce862ebae6c0fa1
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 3 11:31:16 2011 +0100
[LINUX] 2.6.38: Updates wm831x-ts to state of the art
commit 80e6a04540264b74fab3b4bc6479858243061f2b
Merge: 40e399adeeb82caa547db8e6e780438239613dd5 5986c6a5c794a966d7139fec3c1f52841a60a54b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 3 09:56:13 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 40e399adeeb82caa547db8e6e780438239613dd5
Author: Julien Boibessot <jul...@ar...>
Date: Thu Feb 3 09:34:38 2011 +0100
[LINUX] 2.6.38: improve GPIO declaration for APF51Dev
commit b1ed4f50d04b4d0d86421423d34ef0846defe3f5
Author: Julien Boibessot <jul...@ar...>
Date: Wed Feb 2 15:20:16 2011 +0100
[LINUX] 2.6.38: Updates wm831x-ts to state of the art
-----------------------------------------------------------------------
Summary of changes:
.../408-armadeus-add_apf51-dev_baseboard.patch | 32 +++---
...fson-mfd-wm831x-Flag_IRQ_as_a_wake_source.patch | 37 ++++++
...-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch | 76 +++--------
...t-wm831x-Update_following_upstream_review.patch | 133 ++++++++++++++++++++
..._configuration_of_IRQ_output_in_CMOS_mode.patch | 27 ++---
...cknowledgement-of-WM831x-touchscreen-IRQs.patch | 17 +--
.../417-armadeus-input-wm831x-driver_hacks.patch | 8 +-
7 files changed, 231 insertions(+), 99 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-wolfson-mfd-wm831x-Flag_IRQ_as_a_wake_source.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Update_following_upstream_review.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
index bcf7883..34bc443 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/408-armadeus-add_apf51-dev_baseboard.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-06 15:53:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-06 19:51:04.000000000 +0100
+--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-02-02 15:24:30.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-02-03 09:20:56.000000000 +0100
@@ -106,12 +106,30 @@
select SOC_IMX51
select IMX_HAVE_PLATFORM_IMX_UART
@@ -41,8 +41,8 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2011-01-06 15:53:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-06 19:51:04.000000000 +0100
+--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2011-02-02 15:24:30.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-02-03 09:20:56.000000000 +0100
@@ -7,6 +7,7 @@
obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o
@@ -54,8 +54,8 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-01-06 19:45:35.000000000 +0100
-@@ -0,0 +1,270 @@
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/apf51dev-baseboard.c 2011-02-03 09:11:40.000000000 +0100
+@@ -0,0 +1,272 @@
+ /*
+ * Support for APF51's official development baseboard (APF51Dev)
+ *
@@ -104,8 +104,8 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51dev-baseboard.c
+ MX51_PAD_SD2_DATA2__SD2_DATA2,
+ MX51_PAD_SD2_DATA3__SD2_DATA3,
+
-+ MX51_PAD_EIM_EB2__GPIO_2_22, /* PWRDN# */
-+ MX51_PAD_EIM_EB3__GPIO_2_23, /* RESET# */
++ MX51_PAD_EIM_EB2__GPIO_2_22, /* WIFI_PWRDN# */
++ MX51_PAD_EIM_EB3__GPIO_2_23, /* WIFI_RESET# */
+
+ /* UART2 (Bluetooth) */
+ MX51_PAD_UART2_RXD__UART2_RXD,
@@ -113,7 +113,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51dev-baseboard.c
+ MX51_PAD_EIM_D25__UART2_CTS,
+ MX51_PAD_EIM_D26__UART2_RTS,
+
-+ MX51_PAD_EIM_CS3__GPIO_2_28, /* RESET# */
++ MX51_PAD_EIM_CS3__GPIO_2_28, /* BT_RESET# */
+
+ /* UART1 */
+ MX51_PAD_UART1_RXD__UART1_RXD,
@@ -128,12 +128,16 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51dev-baseboard.c
+ MX51_PAD_CSPI1_SS0__GPIO_4_24,
+ MX51_PAD_CSPI1_SS1__GPIO_4_25,
+
++ MX51_PAD_NANDF_D14__GPIO_3_26, /* ADC_SSTRB */
++
+ /* eCSPI2 */
+ MX51_PAD_NANDF_RB2__ECSPI2_SCLK,
+ MX51_PAD_NANDF_RB3__ECSPI2_MISO,
+ MX51_PAD_NANDF_D15__ECSPI2_MOSI,
-+ MX51_PAD_NANDF_D12__GPIO_3_28, /* SS1 */
-+ MX51_PAD_NANDF_D13__GPIO_3_27, /* SS2 */
++ MX51_PAD_NANDF_D12__GPIO_3_28, /* SS1 */
++ MX51_PAD_NANDF_D13__GPIO_3_27, /* SS2 */
++
++ MX51_PAD_NANDF_RB1__GPIO_3_9, /* CAN_INT# */
+
+ /* Display */
+ MX51_PAD_DISP1_DAT0__DISP1_DAT0,
@@ -164,15 +168,13 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/apf51dev-baseboard.c
+ MX51_PAD_DI1_PIN3__DI1_PIN3, /* VSYNC */
+ /* CLK and OE are not muxed */
+
-+ /* JTAG */
-+
+ /* ONEWIRE */
+
+ /* KEYPAD */
+
+ /* Other GPIOs ! TBDL ! */
-+ /* HDMI_RST# */
-+ /* HDMI_DETECT */
++ MX51_PAD_I2C1_CLK__GPIO_4_16, /* HDMI_RST# */
++ MX51_PAD_I2C1_DAT__GPIO_4_17, /* HDMI_DETECT */
+};
+
+static const struct imxi2c_platform_data apf51dev_i2c_data __initconst = {
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-wolfson-mfd-wm831x-Flag_IRQ_as_a_wake_source.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-wolfson-mfd-wm831x-Flag_IRQ_as_a_wake_source.patch
new file mode 100644
index 0000000..47df1b6
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-wolfson-mfd-wm831x-Flag_IRQ_as_a_wake_source.patch
@@ -0,0 +1,37 @@
+From: Mark Brown <br...@op...>
+Date: Wed, 5 Jan 2011 17:56:01 +0000 (+0000)
+Subject: mfd: Flag WM831x /IRQ as a wake source
+X-Git-Url: http://opensource.wolfsonmicro.com/cgi-bin/gitweb.cgi?p=linux-2.6-audioplus.git;a=commitdiff_plain;h=0567e396f8345409788ae3e0a436723517b7ada9
+
+mfd: Flag WM831x /IRQ as a wake source
+
+The WM831x can generate wake events, some unconditionally, so flag
+the primary IRQ as a wake source in order to help the CPU treat the
+/IRQ signal appropriately.
+
+Signed-off-by: Mark Brown <br...@op...>
+Signed-off-by: Samuel Ortiz <sa...@li...>
+---
+
+diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
+index 660ec3f..299437d 100644
+--- a/drivers/mfd/wm831x-irq.c
++++ b/drivers/mfd/wm831x-irq.c
+@@ -506,6 +506,17 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
+ return 0;
+ }
+
++ /* Try to flag /IRQ as a wake source; there are a number of
++ * unconditional wake sources in the PMIC so this isn't
++ * conditional but we don't actually care *too* much if it
++ * fails.
++ */
++ ret = enable_irq_wake(irq);
++ if (ret != 0) {
++ dev_warn(wm831x->dev, "Can't enable IRQ as wake source: %d\n",
++ ret);
++ }
++
+ wm831x->irq = irq;
+ wm831x->irq_base = pdata->irq_base;
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch
index a30cb6d..9ea9bbc 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch
@@ -1,7 +1,9 @@
->From a1ae1fa080f0d352f044c97f9c469e3275235402 Mon Sep 17 00:00:00 2001
From: Mark Brown <br...@op...>
-Date: Fri, 14 Jan 2011 15:07:22 +0000
-Subject: [PATCH] Input: wm831x - Add driver for Wolfson WM831x PMIC touchscreen controllers
+Date: Mon, 24 Jan 2011 16:16:22 +0000 (+0000)
+Subject: Input: wm831x - Add driver for Wolfson WM831x PMIC touchscreen controllers
+X-Git-Url: http://opensource.wolfsonmicro.com/cgi-bin/gitweb.cgi?p=linux-2.6-audioplus.git;a=commitdiff_plain;h=477af4e45ba2d6315eebb8c45d1fc1ee1edc9ac4
+
+Input: wm831x - Add driver for Wolfson WM831x PMIC touchscreen controllers
Some of the WM831x series of PMICs from Wolfson Microelectronics include
a resistive touchscreen controller. Implement support for these controllers
@@ -10,22 +12,16 @@ within the input API.
Platform data is supported to allow configuration of system parameters such
as selection between four and five wire touchscreens and for specification
of optional direct to CPU IRQs for sample availability and for pen down.
+Use of this feature for at least the data IRQ is strongly recommended.
-THIS DRIVER HAS NOT BEEN TESTED. NO GUARANTEES ARE MADE REGARDING THE
-PERFORMANCE OR STABILITY OF THE DRIVER, IT IS EXPECTED THAT SOME DEBUGGING
-WILL BE REQUIRED IN ORDER TO MAKE THE DRIVER USABLE.
+Thanks to Julien Boibessot for extensive testing and detailed feedback.
Signed-off-by: Mark Brown <br...@op...>
+Tested-by: Julien Boibessot <jul...@ar...>
---
- drivers/input/touchscreen/Kconfig | 10 +
- drivers/input/touchscreen/Makefile | 1 +
- drivers/input/touchscreen/wm831x-ts.c | 399 +++++++++++++++++++++++++++++++++
- include/linux/mfd/wm831x/pdata.h | 1 +
- 4 files changed, 411 insertions(+), 0 deletions(-)
- create mode 100644 drivers/input/touchscreen/wm831x-ts.c
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
-index 0c9f4b1..f29dab7 100644
+index 06ea8da..d445ce7 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -423,6 +423,16 @@ config TOUCHSCREEN_UCB1400
@@ -40,16 +36,16 @@ index 0c9f4b1..f29dab7 100644
+ series of PMICs.
+
+ To compile this driver as a module, choose M here: the
-+ module will be called wm831x-touch.
++ module will be called wm831x-ts.
+
config TOUCHSCREEN_WM97XX
tristate "Support for WM97xx AC97 touchscreen controllers"
depends on AC97_BUS
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
-index 718bcc8..e8dcfab 100644
+index 7cc1b4f..1a00395 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
-@@ -48,6 +48,7 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o
+@@ -47,6 +47,7 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o
obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o
obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o
obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o
@@ -59,10 +55,10 @@ index 718bcc8..e8dcfab 100644
wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o
diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
new file mode 100644
-index 0000000..9a58a11
+index 0000000..3e8256d
--- /dev/null
+++ b/drivers/input/touchscreen/wm831x-ts.c
-@@ -0,0 +1,399 @@
+@@ -0,0 +1,372 @@
+/*
+ * wm831x-ts.c - Touchscreen driver for WM831x PMICs
+ *
@@ -95,29 +91,11 @@ index 0000000..9a58a11
+ * R16424 (0x4028) - Touch Control 1
+ */
+#define WM831X_TCH_ENA 0x8000 /* TCH_ENA */
-+#define WM831X_TCH_ENA_MASK 0x8000 /* TCH_ENA */
-+#define WM831X_TCH_ENA_SHIFT 15 /* TCH_ENA */
-+#define WM831X_TCH_ENA_WIDTH 1 /* TCH_ENA */
+#define WM831X_TCH_CVT_ENA 0x4000 /* TCH_CVT_ENA */
-+#define WM831X_TCH_CVT_ENA_MASK 0x4000 /* TCH_CVT_ENA */
-+#define WM831X_TCH_CVT_ENA_SHIFT 14 /* TCH_CVT_ENA */
-+#define WM831X_TCH_CVT_ENA_WIDTH 1 /* TCH_CVT_ENA */
+#define WM831X_TCH_SLPENA 0x1000 /* TCH_SLPENA */
-+#define WM831X_TCH_SLPENA_MASK 0x1000 /* TCH_SLPENA */
-+#define WM831X_TCH_SLPENA_SHIFT 12 /* TCH_SLPENA */
-+#define WM831X_TCH_SLPENA_WIDTH 1 /* TCH_SLPENA */
+#define WM831X_TCH_Z_ENA 0x0400 /* TCH_Z_ENA */
-+#define WM831X_TCH_Z_ENA_MASK 0x0400 /* TCH_Z_ENA */
-+#define WM831X_TCH_Z_ENA_SHIFT 10 /* TCH_Z_ENA */
-+#define WM831X_TCH_Z_ENA_WIDTH 1 /* TCH_Z_ENA */
+#define WM831X_TCH_Y_ENA 0x0200 /* TCH_Y_ENA */
-+#define WM831X_TCH_Y_ENA_MASK 0x0200 /* TCH_Y_ENA */
-+#define WM831X_TCH_Y_ENA_SHIFT 9 /* TCH_Y_ENA */
-+#define WM831X_TCH_Y_ENA_WIDTH 1 /* TCH_Y_ENA */
+#define WM831X_TCH_X_ENA 0x0100 /* TCH_X_ENA */
-+#define WM831X_TCH_X_ENA_MASK 0x0100 /* TCH_X_ENA */
-+#define WM831X_TCH_X_ENA_SHIFT 8 /* TCH_X_ENA */
-+#define WM831X_TCH_X_ENA_WIDTH 1 /* TCH_X_ENA */
+#define WM831X_TCH_DELAY_MASK 0x00E0 /* TCH_DELAY - [7:5] */
+#define WM831X_TCH_DELAY_SHIFT 5 /* TCH_DELAY - [7:5] */
+#define WM831X_TCH_DELAY_WIDTH 3 /* TCH_DELAY - [7:5] */
@@ -129,21 +107,9 @@ index 0000000..9a58a11
+ * R16425 (0x4029) - Touch Control 2
+ */
+#define WM831X_TCH_PD_WK 0x2000 /* TCH_PD_WK */
-+#define WM831X_TCH_PD_WK_MASK 0x2000 /* TCH_PD_WK */
-+#define WM831X_TCH_PD_WK_SHIFT 13 /* TCH_PD_WK */
-+#define WM831X_TCH_PD_WK_WIDTH 1 /* TCH_PD_WK */
+#define WM831X_TCH_5WIRE 0x1000 /* TCH_5WIRE */
-+#define WM831X_TCH_5WIRE_MASK 0x1000 /* TCH_5WIRE */
-+#define WM831X_TCH_5WIRE_SHIFT 12 /* TCH_5WIRE */
-+#define WM831X_TCH_5WIRE_WIDTH 1 /* TCH_5WIRE */
+#define WM831X_TCH_PDONLY 0x0800 /* TCH_PDONLY */
-+#define WM831X_TCH_PDONLY_MASK 0x0800 /* TCH_PDONLY */
-+#define WM831X_TCH_PDONLY_SHIFT 11 /* TCH_PDONLY */
-+#define WM831X_TCH_PDONLY_WIDTH 1 /* TCH_PDONLY */
+#define WM831X_TCH_ISEL 0x0100 /* TCH_ISEL */
-+#define WM831X_TCH_ISEL_MASK 0x0100 /* TCH_ISEL */
-+#define WM831X_TCH_ISEL_SHIFT 8 /* TCH_ISEL */
-+#define WM831X_TCH_ISEL_WIDTH 1 /* TCH_ISEL */
+#define WM831X_TCH_RPU_MASK 0x000F /* TCH_RPU - [3:0] */
+#define WM831X_TCH_RPU_SHIFT 0 /* TCH_RPU - [3:0] */
+#define WM831X_TCH_RPU_WIDTH 4 /* TCH_RPU - [3:0] */
@@ -152,9 +118,6 @@ index 0000000..9a58a11
+ * R16426-8 (0x402A-C) - Touch Data X/Y/X
+ */
+#define WM831X_TCH_PD 0x8000 /* TCH_PD1 */
-+#define WM831X_TCH_PD_MASK 0x8000 /* TCH_PD1 */
-+#define WM831X_TCH_PD_SHIFT 15 /* TCH_PD1 */
-+#define WM831X_TCH_PD_WIDTH 1 /* TCH_PD1 */
+#define WM831X_TCH_DATA_MASK 0x0FFF /* TCH_DATA - [11:0] */
+#define WM831X_TCH_DATA_SHIFT 0 /* TCH_DATA - [11:0] */
+#define WM831X_TCH_DATA_WIDTH 12 /* TCH_DATA - [11:0] */
@@ -213,6 +176,12 @@ index 0000000..9a58a11
+ WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
+ WM831X_TCH_Z_ENA, 0);
+
++ /* Flush any final samples that arrived while reading */
++ wm831x_set_bits(wm831x, WM831X_INTERRUPT_STATUS_1,
++ WM831X_TCHDATA_EINT, WM831X_TCHDATA_EINT);
++
++ wm831x_bulk_read(wm831x, WM831X_TOUCH_DATA_X, count, data);
++
+ if (wm831x_ts->pressure)
+ input_report_abs(wm831x_ts->input_dev,
+ ABS_PRESSURE, 0);
@@ -278,7 +247,7 @@ index 0000000..9a58a11
+ WM831X_TCH_Z_ENA, 0);
+
+ if (wm831x_ts->pen_down)
-+ disable_irq_nosync(wm831x_ts->pen_down);
++ disable_irq_nosync(wm831x_ts->data_irq);
+}
+
+static __devinit int wm831x_ts_probe(struct platform_device *pdev)
@@ -474,6 +443,3 @@ index 1ae8499..c6746e8 100644
};
enum wm831x_watchdog_action {
---
-1.7.2.3
-
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Update_following_upstream_review.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Update_following_upstream_review.patch
new file mode 100644
index 0000000..3a1b677
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Update_following_upstream_review.patch
@@ -0,0 +1,133 @@
+From: Mark Brown <br...@op...>
+Date: Tue, 25 Jan 2011 19:51:38 +0000 (+0000)
+Subject: Input: wm831x-ts - Update following upstream review
+X-Git-Url: http://opensource.wolfsonmicro.com/cgi-bin/gitweb.cgi?p=linux-2.6-audioplus.git;a=commitdiff_plain;h=279eb03e2bf2b3360d89311cb5535b54c4a25f3c
+
+Input: wm831x-ts - Update following upstream review
+
+Signed-off-by: Mark Brown <br...@op...>
+---
+
+diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
+index 3e8256d..155da5d 100644
+--- a/drivers/input/touchscreen/wm831x-ts.c
++++ b/drivers/input/touchscreen/wm831x-ts.c
+@@ -1,7 +1,7 @@
+ /*
+ * wm831x-ts.c - Touchscreen driver for WM831x PMICs
+ *
+- * Copyright 2010 Wolfson Microelectronics plc.
++ * Copyright 2011 Wolfson Microelectronics plc.
+ * Author: Mark Brown <br...@op...>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+@@ -64,8 +64,8 @@
+ struct wm831x_ts {
+ struct input_dev *input_dev;
+ struct wm831x *wm831x;
+- int data_irq;
+- int pd_irq;
++ unsigned int data_irq;
++ unsigned int pd_irq;
+ bool pressure;
+ bool pen_down;
+ };
+@@ -186,7 +186,7 @@ static void wm831x_ts_input_close(struct input_dev *idev)
+ WM831X_TCH_Z_ENA, 0);
+
+ if (wm831x_ts->pen_down)
+- disable_irq_nosync(wm831x_ts->data_irq);
++ disable_irq(wm831x_ts->data_irq);
+ }
+
+ static __devinit int wm831x_ts_probe(struct platform_device *pdev)
+@@ -204,13 +204,20 @@ static __devinit int wm831x_ts_probe(struct platform_device *pdev)
+
+ wm831x_ts->wm831x = wm831x;
+
++ input_dev = input_allocate_device();
++ if (input_dev == NULL) {
++ ret = -ENOMEM;
++ goto err_alloc;
++ }
++ wm831x_ts->input_dev = input_dev;
++
+ if (core_pdata && core_pdata->touch)
+ pdata = core_pdata->touch;
+ else
+ pdata = NULL;
+
+- /* If we have a direct CPU data IRQ use it, otherwise use
+- * the interrupt through the WM831x IRQ controller.
++ /* If we have a direct IRQ use it, otherwise use the interrupt
++ * from the WM831x IRQ controller.
+ */
+ if (pdata && pdata->data_irq)
+ wm831x_ts->data_irq = pdata->data_irq;
+@@ -272,15 +279,13 @@ static __devinit int wm831x_ts_probe(struct platform_device *pdev)
+ if (ret < 0) {
+ dev_err(&pdev->dev, "Failed to request data IRQ %d: %d\n",
+ wm831x_ts->data_irq, ret);
+- goto err_alloc;
++ goto err_dev_alloc;
+ }
+ disable_irq(wm831x_ts->data_irq);
+
+ ret = request_threaded_irq(wm831x_ts->pd_irq, NULL,
+- wm831x_ts_pen_down_irq,
+- IRQF_SAMPLE_RANDOM | IRQF_ONESHOT,
++ wm831x_ts_pen_down_irq, IRQF_ONESHOT,
+ "Touchscreen pen down", wm831x_ts);
+-
+ if (ret < 0) {
+ dev_err(&pdev->dev, "Failed to request pen down IRQ %d: %d\n",
+ wm831x_ts->pd_irq, ret);
+@@ -289,13 +294,6 @@ static __devinit int wm831x_ts_probe(struct platform_device *pdev)
+
+ platform_set_drvdata(pdev, wm831x_ts);
+
+- input_dev = input_allocate_device();
+- if (input_dev == NULL) {
+- ret = -ENOMEM;
+- goto err_pd_irq;
+- }
+- wm831x_ts->input_dev = input_dev;
+-
+ /* set up touch configuration */
+ input_dev->name = "WM831x touchscreen";
+ input_dev->phys = "wm831x";
+@@ -316,16 +314,16 @@ static __devinit int wm831x_ts_probe(struct platform_device *pdev)
+
+ ret = input_register_device(input_dev);
+ if (ret < 0)
+- goto err_dev_alloc;
++ goto err_pd_irq;
+
+ return ret;
+
+-err_dev_alloc:
+- input_free_device(input_dev);
+ err_pd_irq:
+ free_irq(wm831x_ts->pd_irq, wm831x_ts);
+ err_data_irq:
+ free_irq(wm831x_ts->data_irq, wm831x_ts);
++err_dev_alloc:
++ input_free_device(input_dev);
+ err_alloc:
+ kfree(wm831x_ts);
+
+diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
+index c6746e8..ac3aa73 100644
+--- a/include/linux/mfd/wm831x/pdata.h
++++ b/include/linux/mfd/wm831x/pdata.h
+@@ -80,8 +80,8 @@ struct wm831x_touch_pdata {
+ int isel; /** Current for pen down (uA) */
+ int rpu; /** Pen down sensitivity resistor divider */
+ int pressure; /** Report pressure (boolean) */
+- int data_irq; /** Touch data ready IRQ */
+- int pd_irq; /** Touch pendown detect IRQ */
++ unsigned int data_irq; /** Touch data ready IRQ */
++ unsigned int pd_irq; /** Touch pendown detect IRQ */
+ };
+
+ enum wm831x_watchdog_action {
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch
index fc5c6a8..6461e2d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch
@@ -1,7 +1,9 @@
->From 25d95db8096f73f3c7d277f44c8daf7642142e2f Mon Sep 17 00:00:00 2001
From: Mark Brown <br...@op...>
-Date: Thu, 6 Jan 2011 13:08:25 +0000
-Subject: [PATCH] mfd: Support configuration of WM831x /IRQ output in CMOS mode
+Date: Thu, 6 Jan 2011 13:08:25 +0000 (+0000)
+Subject: mfd: Support configuration of WM831x /IRQ output in CMOS mode
+X-Git-Url: http://opensource.wolfsonmicro.com/cgi-bin/gitweb.cgi?p=linux-2.6-audioplus.git;a=commitdiff_plain;h=514dea30d1f8826f37e009730ea9d4d50bf9e998
+
+mfd: Support configuration of WM831x /IRQ output in CMOS mode
Provide platform data allowing the system to set the /IRQ pin into
CMOS mode rather than the default open drain. The default value of
@@ -10,15 +12,12 @@ there should be no change to existing users.
Signed-off-by: Mark Brown <br...@op...>
---
- drivers/mfd/wm831x-irq.c | 7 +++++++
- include/linux/mfd/wm831x/pdata.h | 3 +++
- 2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
-index f7192d4..0d3cda4 100644
+index 299437d..7a24c66 100644
--- a/drivers/mfd/wm831x-irq.c
+++ b/drivers/mfd/wm831x-irq.c
-@@ -515,6 +515,13 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
+@@ -506,6 +506,14 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
return 0;
}
@@ -26,17 +25,18 @@ index f7192d4..0d3cda4 100644
+ i = 0;
+ else
+ i = WM831X_IRQ_OD;
++
+ wm831x_set_bits(wm831x, WM831X_IRQ_CONFIG,
+ WM831X_IRQ_OD, i);
+
- wm831x->irq = irq;
- wm831x->irq_base = pdata->irq_base;
-
+ /* Try to flag /IRQ as a wake source; there are a number of
+ * unconditional wake sources in the PMIC so this isn't
+ * conditional but we don't actually care *too* much if it
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
index fd322ac..1ae8499 100644
--- a/include/linux/mfd/wm831x/pdata.h
+++ b/include/linux/mfd/wm831x/pdata.h
-@@ -109,6 +109,9 @@ struct wm831x_pdata {
+@@ -108,6 +108,9 @@ struct wm831x_pdata {
/** Called after subdevices are set up */
int (*post_init)(struct wm831x *wm831x);
@@ -46,6 +46,3 @@ index fd322ac..1ae8499 100644
int irq_base;
int gpio_base;
struct wm831x_backlight_pdata *backlight;
---
-1.7.2.3
-
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/414-wolfson-mfd-Leave-acknowledgement-of-WM831x-touchscreen-IRQs.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/414-wolfson-mfd-Leave-acknowledgement-of-WM831x-touchscreen-IRQs.patch
index f1371cc..61d4ecd 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/414-wolfson-mfd-Leave-acknowledgement-of-WM831x-touchscreen-IRQs.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/414-wolfson-mfd-Leave-acknowledgement-of-WM831x-touchscreen-IRQs.patch
@@ -1,7 +1,9 @@
->From c0ddb6e52161faaa4d88967fe955fd9df5bac477 Mon Sep 17 00:00:00 2001
From: Mark Brown <br...@op...>
-Date: Mon, 10 Jan 2011 18:15:56 +0000
-Subject: [PATCH 2/2] mfd: Leave acknowledgement of WM831x touchscreen IRQs to the driver
+Date: Mon, 10 Jan 2011 18:15:56 +0000 (+0000)
+Subject: mfd: Leave acknowledgement of WM831x touchscreen IRQs to the driver
+X-Git-Url: http://opensource.wolfsonmicro.com/cgi-bin/gitweb.cgi?p=linux-2.6-audioplus.git;a=commitdiff_plain;h=a12170399f6e1a06631a281fe085fd356dd7de37
+
+mfd: Leave acknowledgement of WM831x touchscreen IRQs to the driver
The WM831x touchscreen interrupts need acknowledgement even when using
direct signals to the CPU (which don't go through the core) so leave
@@ -9,14 +11,12 @@ the acknowledgement up to the touchscreen driver for simplicity.
Signed-off-by: Mark Brown <br...@op...>
---
- drivers/mfd/wm831x-irq.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
-index 0d3cda4..2f26f80 100644
+index 7a24c66..46db25b 100644
--- a/drivers/mfd/wm831x-irq.c
+++ b/drivers/mfd/wm831x-irq.c
-@@ -481,6 +481,9 @@ static irqreturn_t wm831x_irq_thread(int irq, void *data)
+@@ -470,6 +470,9 @@ static irqreturn_t wm831x_irq_thread(int irq, void *data)
}
out:
@@ -26,6 +26,3 @@ index 0d3cda4..2f26f80 100644
for (i = 0; i < ARRAY_SIZE(status_regs); i++) {
if (status_regs[i])
wm831x_reg_write(wm831x, WM831X_INTERRUPT_STATUS_1 + i,
---
-1.7.2.3
-
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch
index 0301ead..27cd89e 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch
@@ -21,7 +21,7 @@ Index: linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c
WARN_ON(pdata->pressure && pdata->fivewire);
wm831x_ts->pressure = false;
} else {
-@@ -316,6 +317,17 @@
+@@ -294,6 +295,17 @@
platform_set_drvdata(pdev, wm831x_ts);
@@ -36,6 +36,6 @@ Index: linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c
+ wm831x_reg_write(wm831x, 0x404d, 0x0000); /* LED2 off */
+ wm831x_reg_write(wm831x, 0x4037 + 6, 0x0086);
+
- input_dev = input_allocate_device();
- if (input_dev == NULL) {
- ret = -ENOMEM;
+ /* set up touch configuration */
+ input_dev->name = "WM831x touchscreen";
+ input_dev->phys = "wm831x";
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-01-28 11:08:24
|
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 5986c6a5c794a966d7139fec3c1f52841a60a54b (commit)
from 7e7a361eaa63c3a5a0ac75f1864600265a075720 (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 5986c6a5c794a966d7139fec3c1f52841a60a54b
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jan 28 12:08:03 2011 +0100
[as_devices] Make python wrapper compiling under BR2010
-----------------------------------------------------------------------
Summary of changes:
target/packages/as_devices/python/Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/target/packages/as_devices/python/Makefile b/target/packages/as_devices/python/Makefile
index f6aa4cb..067d6d4 100644
--- a/target/packages/as_devices/python/Makefile
+++ b/target/packages/as_devices/python/Makefile
@@ -1,6 +1,6 @@
# Default values for local compiling:
ARMADEUS_BASE_DIR=../../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
CFLAGS=-Wall -g -O0
hooks/post-receive
--
armadeus
|
|
From: Fabien M <fa...@us...> - 2011-01-28 10:59:28
|
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 7e7a361eaa63c3a5a0ac75f1864600265a075720 (commit)
via c861ffe6eac768957f4be85df8e13bbd407d07b3 (commit)
from 519b0d140ee152ebbc83f686319212bcd6cad803 (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 7e7a361eaa63c3a5a0ac75f1864600265a075720
Merge: c861ffe6eac768957f4be85df8e13bbd407d07b3 519b0d140ee152ebbc83f686319212bcd6cad803
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jan 28 11:59:04 2011 +0100
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit c861ffe6eac768957f4be85df8e13bbd407d07b3
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jan 28 11:58:33 2011 +0100
[buildroot][BR2010.11] Avoid #hunk in patches
-----------------------------------------------------------------------
Summary of changes:
patches/buildroot/2010.11/018-allegro.patch | 12 ++++++------
.../buildroot/2010.11/021-sdl-water-config.patch | 10 +++++-----
patches/buildroot/2010.11/034-slideshow.patch | 14 +++++++-------
patches/buildroot/2010.11/041-fbgrab.patch | 12 ++++++------
patches/buildroot/2010.11/042-socketcan.patch | 14 +++++++-------
.../buildroot/2010.11/043-mesa-add_packages.patch | 12 ++++++------
...ot-makes_binary_targets_name_overloadable.patch | 16 ++++++++--------
.../054-ntp-allow_ntpd_selection_or_not.patch | 10 +++++-----
.../2010.11/055-pyserial-add_package.patch | 10 +++++-----
.../2010.11/057-pymysql-add_package.patch | 14 +++++++-------
...x_in_a_standalone_way_after_configuration.patch | 6 +++---
.../2010.11/083-adds_pygame_package.patch | 12 ++++++------
.../buildroot/2010.11/085-adds_gpm_package.patch | 12 ++++++------
.../buildroot/2010.11/095-uucp-add_packages.patch | 10 +++++-----
.../buildroot/2010.11/110-bluez-add_package.patch | 6 +++---
.../2010.11/116-openobex-add_package.patch | 16 ++++++++--------
.../2010.11/117-ussp-push-add_package.patch | 10 +++++-----
.../buildroot/2010.11/118-snes9x-add_package.patch | 12 ++++++------
.../buildroot/2010.11/119-fbtest-add_package.patch | 16 ++++++++--------
.../2010.11/121-target-arm926t_is_arm926ej-s.patch | 6 +++---
.../buildroot/2010.11/122-urg-add_package.patch | 10 +++++-----
.../2010.11/123-pywebradio-add_package.patch | 10 +++++-----
.../buildroot/2010.11/124-e-uae-add_package.patch | 10 +++++-----
.../2010.11/130-lbreakout-add_package.patch | 10 +++++-----
.../2010.11/131-ltetris-add_package.patch | 12 ++++++------
.../buildroot/2010.11/133-qwt-add_package.patch | 12 ++++++------
...ffs2-add_board_name_to_binary_rootfs_name.patch | 12 ++++++------
.../2010.11/141-qt-fix_mysql_module.patch | 10 +++++-----
28 files changed, 158 insertions(+), 158 deletions(-)
diff --git a/patches/buildroot/2010.11/018-allegro.patch b/patches/buildroot/2010.11/018-allegro.patch
index 3863334..130ed2f 100644
--- a/patches/buildroot/2010.11/018-allegro.patch
+++ b/patches/buildroot/2010.11/018-allegro.patch
@@ -4,10 +4,10 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:09:53.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:10:14.000000000 +0200
-@@ -89,6 +89,7 @@
- menu "Graphic libraries and applications (graphic/text)"
+--- buildroot.orig/package/Config.in 2011-01-27 15:23:09.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:23:42.000000000 +0100
+@@ -93,6 +93,7 @@
+ source "package/rrdtool/Config.in"
comment "graphic libraries"
+source "package/allegro/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/allegro/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/Config.in 2010-06-23 14:10:14.000000000 +0200
++++ buildroot/package/allegro/Config.in 2011-01-27 15:23:42.000000000 +0100
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_ALLEGRO
+ bool "Allegro"
@@ -35,7 +35,7 @@ Index: buildroot/package/allegro/Config.in
Index: buildroot/package/allegro/allegro.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/allegro/allegro.mk 2010-06-23 14:10:14.000000000 +0200
++++ buildroot/package/allegro/allegro.mk 2011-01-27 15:23:42.000000000 +0100
@@ -0,0 +1,75 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.11/021-sdl-water-config.patch b/patches/buildroot/2010.11/021-sdl-water-config.patch
index ecfcfb5..eae81c6 100644
--- a/patches/buildroot/2010.11/021-sdl-water-config.patch
+++ b/patches/buildroot/2010.11/021-sdl-water-config.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:10:14.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:10:18.000000000 +0200
-@@ -109,6 +109,8 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:23:42.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:23:50.000000000 +0100
+@@ -113,6 +113,8 @@
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
source "package/sdl_gfx/Config.in"
@@ -18,7 +18,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/sdlwater/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/Config.in 2010-06-23 14:10:18.000000000 +0200
++++ buildroot/package/sdlwater/Config.in 2011-01-27 15:23:50.000000000 +0100
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SDL_WATER
+ bool "SDL_water"
@@ -30,7 +30,7 @@ Index: buildroot/package/sdlwater/Config.in
Index: buildroot/package/sdlwater/sdlwater.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/sdlwater/sdlwater.mk 2010-06-23 14:10:18.000000000 +0200
++++ buildroot/package/sdlwater/sdlwater.mk 2011-01-27 15:23:50.000000000 +0100
@@ -0,0 +1,65 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.11/034-slideshow.patch b/patches/buildroot/2010.11/034-slideshow.patch
index 901ef7f..30bddb0 100644
--- a/patches/buildroot/2010.11/034-slideshow.patch
+++ b/patches/buildroot/2010.11/034-slideshow.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:10:18.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:10:23.000000000 +0200
-@@ -109,6 +109,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:23:50.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:23:54.000000000 +0100
+@@ -113,6 +113,7 @@
source "package/sdl_net/Config.in"
source "package/sdl_ttf/Config.in"
source "package/sdl_gfx/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/slideshow/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/Config.in 2010-06-23 14:10:23.000000000 +0200
++++ buildroot/package/slideshow/Config.in 2011-01-27 15:23:54.000000000 +0100
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SLIDESHOW
+ bool "Slideshow"
@@ -31,7 +31,7 @@ Index: buildroot/package/slideshow/Config.in
Index: buildroot/package/slideshow/slideshow.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow.mk 2010-06-23 14:10:23.000000000 +0200
++++ buildroot/package/slideshow/slideshow.mk 2011-01-27 15:23:54.000000000 +0100
@@ -0,0 +1,51 @@
+#############################################################
+#
@@ -87,7 +87,7 @@ Index: buildroot/package/slideshow/slideshow.mk
Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2010-06-23 14:10:23.000000000 +0200
++++ buildroot/package/slideshow/slideshow-01-restart-after-end.patch 2011-01-27 15:23:54.000000000 +0100
@@ -0,0 +1,73 @@
+--- slideshow/slideshow.cpp 2003-12-08 22:17:38.000000000 +0100
++++ slideshow.mod/slideshow.cpp 2007-09-08 19:05:10.000000000 +0200
@@ -165,7 +165,7 @@ Index: buildroot/package/slideshow/slideshow-01-restart-after-end.patch
Index: buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2010-06-23 14:10:23.000000000 +0200
++++ buildroot/package/slideshow/slideshow-02-remove-compile-warning.patch 2011-01-27 15:23:54.000000000 +0100
@@ -0,0 +1,13 @@
+--- slideshow.org/SDLFont.cpp 2007-11-17 19:25:02.000000000 +0100
++++ slideshow/SDLFont.cpp 2007-11-17 20:06:20.000000000 +0100
diff --git a/patches/buildroot/2010.11/041-fbgrab.patch b/patches/buildroot/2010.11/041-fbgrab.patch
index 215c62f..889305d 100644
--- a/patches/buildroot/2010.11/041-fbgrab.patch
+++ b/patches/buildroot/2010.11/041-fbgrab.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-10-17 22:15:47.000000000 +0200
-+++ buildroot/package/Config.in 2010-10-18 17:54:27.000000000 +0200
-@@ -97,6 +97,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:23:54.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:23:59.000000000 +0100
+@@ -98,6 +98,7 @@
source "package/directfb-examples/Config.in"
source "package/divine/Config.in"
source "package/fbdump/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/fbgrab/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbgrab/Config.in 2010-10-18 17:54:28.000000000 +0200
++++ buildroot/package/fbgrab/Config.in 2011-01-27 15:23:59.000000000 +0100
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_FBGRAB
+ bool "fbgrab"
@@ -31,7 +31,7 @@ Index: buildroot/package/fbgrab/Config.in
Index: buildroot/package/fbgrab/fbgrab.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbgrab/fbgrab.mk 2010-10-18 17:54:28.000000000 +0200
++++ buildroot/package/fbgrab/fbgrab.mk 2011-01-27 15:23:59.000000000 +0100
@@ -0,0 +1,48 @@
+#############################################################
+#
@@ -84,7 +84,7 @@ Index: buildroot/package/fbgrab/fbgrab.mk
Index: buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch 2010-10-18 17:54:28.000000000 +0200
++++ buildroot/package/fbgrab/fbgrab-1.0-make_it_cross-compile.patch 2011-01-27 15:23:59.000000000 +0100
@@ -0,0 +1,14 @@
+diff -urN fbgrab-1.0/Makefile fbgrab-1.0.mod/Makefile
+--- fbgrab-1.0/Makefile 2002-03-20 20:49:06.000000000 +0100
diff --git a/patches/buildroot/2010.11/042-socketcan.patch b/patches/buildroot/2010.11/042-socketcan.patch
index ea832e1..8ff0bb8 100644
--- a/patches/buildroot/2010.11/042-socketcan.patch
+++ b/patches/buildroot/2010.11/042-socketcan.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-10-18 17:54:27.000000000 +0200
-+++ buildroot/package/Config.in 2010-10-18 17:54:44.000000000 +0200
-@@ -421,6 +421,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:23:59.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:24:01.000000000 +0100
+@@ -428,6 +428,7 @@
source "package/samba/Config.in"
source "package/ser2net/Config.in"
source "package/socat/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/socketcan/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/Config.in 2010-10-18 17:54:44.000000000 +0200
++++ buildroot/package/socketcan/Config.in 2011-01-27 15:24:01.000000000 +0100
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_SOCKETCAN
+ bool "Socket CAN"
@@ -43,7 +43,7 @@ Index: buildroot/package/socketcan/Config.in
Index: buildroot/package/socketcan/socketcan.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan.mk 2010-10-18 17:54:44.000000000 +0200
++++ buildroot/package/socketcan/socketcan.mk 2011-01-27 15:24:01.000000000 +0100
@@ -0,0 +1,68 @@
+#############################################################
+#
@@ -116,7 +116,7 @@ Index: buildroot/package/socketcan/socketcan.mk
Index: buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch 2010-10-18 17:54:44.000000000 +0200
++++ buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch 2011-01-27 15:24:01.000000000 +0100
@@ -0,0 +1,33 @@
+diff -urN socketcan-svn-rev810.org/can-utils/Makefile socketcan-svn-rev810/can-utils/Makefile
+--- socketcan-svn-rev810.org/can-utils/Makefile 2008-07-16 10:52:02.000000000 +0200
@@ -154,7 +154,7 @@ Index: buildroot/package/socketcan/socketcan-svn-rev810-cross-compile.patch
Index: buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch 2010-10-18 17:54:44.000000000 +0200
++++ buildroot/package/socketcan/socketcan-svn-rev874-cross-compile.patch 2011-01-27 15:24:01.000000000 +0100
@@ -0,0 +1,63 @@
+diff -urN socketcan-svn-rev810.org/can-utils/Makefile socketcan-svn-rev810/can-utils/Makefile
+--- socketcan-svn-rev874.org/can-utils/Makefile 2008-07-16 10:52:02.000000000 +0200
diff --git a/patches/buildroot/2010.11/043-mesa-add_packages.patch b/patches/buildroot/2010.11/043-mesa-add_packages.patch
index ec42bd4..6bfb029 100644
--- a/patches/buildroot/2010.11/043-mesa-add_packages.patch
+++ b/patches/buildroot/2010.11/043-mesa-add_packages.patch
@@ -1,8 +1,8 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-10-18 17:54:44.000000000 +0200
-+++ buildroot/package/Config.in 2010-10-18 17:55:03.000000000 +0200
-@@ -278,6 +278,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:24:01.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:24:02.000000000 +0100
+@@ -283,6 +283,7 @@
source "package/librsvg/Config.in"
source "package/libsvgtiny/Config.in"
source "package/libungif/Config.in"
@@ -13,7 +13,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/mesa/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/Config.in 2010-10-18 17:55:03.000000000 +0200
++++ buildroot/package/mesa/Config.in 2011-01-27 15:24:02.000000000 +0100
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_MESALIB
+ bool "Mesa library"
@@ -24,7 +24,7 @@ Index: buildroot/package/mesa/Config.in
Index: buildroot/package/mesa/mesa.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/mesa.mk 2010-10-18 17:55:03.000000000 +0200
++++ buildroot/package/mesa/mesa.mk 2011-01-27 15:24:02.000000000 +0100
@@ -0,0 +1,66 @@
+#############################################################
+#
@@ -95,7 +95,7 @@ Index: buildroot/package/mesa/mesa.mk
Index: buildroot/package/mesa/mesa.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/mesa/mesa.patch 2010-10-18 17:55:03.000000000 +0200
++++ buildroot/package/mesa/mesa.patch 2011-01-27 15:24:02.000000000 +0100
@@ -0,0 +1,188 @@
+diff -bruN Mesa-7.0.orig/configs/arm-linux-osmesa Mesa-7.0/configs/arm-linux-osmesa
+--- Mesa-7.0.orig/configs/arm-linux-osmesa 1970-01-01 01:00:00.000000000 +0100
diff --git a/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch b/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
index 7e3efe8..59d817a 100644
--- a/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
+++ b/patches/buildroot/2010.11/051h-u-boot-makes_binary_targets_name_overloadable.patch
@@ -10,8 +10,8 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
Index: buildroot/boot/u-boot/u-boot.mk
===================================================================
---- buildroot.orig/boot/u-boot/u-boot.mk 2010-11-15 22:50:57.000000000 +0200
-+++ buildroot/boot/u-boot/u-boot.mk 2010-11-15 23:26:05.000000000 +0200
+--- buildroot.orig/boot/u-boot/u-boot.mk 2011-01-27 15:24:18.000000000 +0100
++++ buildroot/boot/u-boot/u-boot.mk 2011-01-27 15:24:20.000000000 +0100
@@ -28,16 +28,22 @@
U_BOOT_DIR:=$(BUILD_DIR)/u-boot-$(U_BOOT_VERSION)
U_BOOT_CAT:=$(BZCAT)
@@ -50,15 +50,15 @@ Index: buildroot/boot/u-boot/u-boot.mk
$(U_BOOT_COPYTO)/$(U_BOOT_TARGET_BIN): $(U_BOOT_DIR)/$(U_BOOT_BIN)
Index: buildroot/Makefile
===================================================================
---- buildroot.orig/Makefile 2010-10-20 14:49:41.000000000 +0200
-+++ buildroot/Makefile 2010-10-20 14:49:52.000000000 +0200
-@@ -304,8 +304,8 @@
- TARGETS+=target-purgelocales
- endif
+--- buildroot.orig/Makefile 2011-01-27 15:22:58.000000000 +0100
++++ buildroot/Makefile 2011-01-27 15:24:20.000000000 +0100
+@@ -301,8 +301,8 @@
+
+ include package/*/*.mk
-include boot/common.mk
include target/Makefile.in
+include boot/common.mk
include linux/linux.mk
- include fs/common.mk
+ TARGETS+=target-finalize
diff --git a/patches/buildroot/2010.11/054-ntp-allow_ntpd_selection_or_not.patch b/patches/buildroot/2010.11/054-ntp-allow_ntpd_selection_or_not.patch
index 384d0b4..a4df4f2 100644
--- a/patches/buildroot/2010.11/054-ntp-allow_ntpd_selection_or_not.patch
+++ b/patches/buildroot/2010.11/054-ntp-allow_ntpd_selection_or_not.patch
@@ -8,8 +8,8 @@ Would BR be interested ?
Index: buildroot/package/ntp/Config.in
===================================================================
---- buildroot.orig/package/ntp/Config.in 2010-10-19 15:50:05.000000000 +0200
-+++ buildroot/package/ntp/Config.in 2010-10-19 15:59:45.000000000 +0200
+--- buildroot.orig/package/ntp/Config.in 2011-01-27 15:22:57.000000000 +0100
++++ buildroot/package/ntp/Config.in 2011-01-27 15:24:27.000000000 +0100
@@ -6,6 +6,12 @@
http://www.ntp.org/
@@ -25,9 +25,9 @@ Index: buildroot/package/ntp/Config.in
depends on BR2_PACKAGE_NTP
Index: buildroot/package/ntp/ntp.mk
===================================================================
---- buildroot.orig/package/ntp/ntp.mk 2010-10-19 15:50:05.000000000 +0200
-+++ buildroot/package/ntp/ntp.mk 2010-10-19 22:28:50.000000000 +0200
-@@ -32,20 +32,20 @@
+--- buildroot.orig/package/ntp/ntp.mk 2011-01-27 15:22:57.000000000 +0100
++++ buildroot/package/ntp/ntp.mk 2011-01-27 15:24:27.000000000 +0100
+@@ -33,20 +33,20 @@
NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_TICKADJ) += util/tickadj
define NTP_INSTALL_TARGET_CMDS
diff --git a/patches/buildroot/2010.11/055-pyserial-add_package.patch b/patches/buildroot/2010.11/055-pyserial-add_package.patch
index d73be12..b88161e 100644
--- a/patches/buildroot/2010.11/055-pyserial-add_package.patch
+++ b/patches/buildroot/2010.11/055-pyserial-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:10:43.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:11:10.000000000 +0200
-@@ -219,6 +219,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:24:02.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:24:29.000000000 +0100
+@@ -230,6 +230,7 @@
source "package/microperl/Config.in"
source "package/php/Config.in"
source "package/python/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pyserial/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pyserial/Config.in 2010-06-23 14:11:10.000000000 +0200
++++ buildroot/package/pyserial/Config.in 2011-01-27 15:24:29.000000000 +0100
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_PYSERIAL
+ bool "pyserial"
@@ -27,7 +27,7 @@ Index: buildroot/package/pyserial/Config.in
Index: buildroot/package/pyserial/pyserial.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pyserial/pyserial.mk 2010-06-23 14:11:10.000000000 +0200
++++ buildroot/package/pyserial/pyserial.mk 2011-01-27 15:24:29.000000000 +0100
@@ -0,0 +1,33 @@
+PYSERIAL_VERSION=2.2
+PYSERIAL_SOURCE=pyserial-$(PYSERIAL_VERSION).zip
diff --git a/patches/buildroot/2010.11/057-pymysql-add_package.patch b/patches/buildroot/2010.11/057-pymysql-add_package.patch
index 39cc6bc..72a1fd1 100644
--- a/patches/buildroot/2010.11/057-pymysql-add_package.patch
+++ b/patches/buildroot/2010.11/057-pymysql-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-10-18 22:56:33.000000000 +0200
-+++ buildroot/package/Config.in 2010-10-18 22:58:58.000000000 +0200
-@@ -227,6 +227,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:24:29.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:24:30.000000000 +0100
+@@ -231,6 +231,7 @@
source "package/php/Config.in"
source "package/python/Config.in"
source "package/pyserial/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pymysql/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/Config.in 2010-10-18 22:58:58.000000000 +0200
++++ buildroot/package/pymysql/Config.in 2011-01-27 15:24:30.000000000 +0100
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYMYSQL
+ depends on BR2_PACKAGE_PYTHON
@@ -31,7 +31,7 @@ Index: buildroot/package/pymysql/Config.in
Index: buildroot/package/pymysql/pymysql.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/pymysql.mk 2010-10-18 22:58:58.000000000 +0200
++++ buildroot/package/pymysql/pymysql.mk 2011-01-27 15:24:30.000000000 +0100
@@ -0,0 +1,76 @@
+#############################################################
+#
@@ -112,7 +112,7 @@ Index: buildroot/package/pymysql/pymysql.mk
Index: buildroot/package/pymysql/pymysql-000-setup.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/pymysql-000-setup.patch 2010-10-18 22:58:58.000000000 +0200
++++ buildroot/package/pymysql/pymysql-000-setup.patch 2011-01-27 15:24:30.000000000 +0100
@@ -0,0 +1,12 @@
+--- MySQL-python-1.2.2/setup.py 2007-02-25 04:37:12.000000000 +0100
++++ MySQL-python-1.2.2/setup.py 2007-08-15 12:23:18.000000000 +0200
@@ -129,7 +129,7 @@ Index: buildroot/package/pymysql/pymysql-000-setup.patch
Index: buildroot/package/pymysql/pymysql-010-threadsafe.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pymysql/pymysql-010-threadsafe.patch 2010-10-18 22:58:58.000000000 +0200
++++ buildroot/package/pymysql/pymysql-010-threadsafe.patch 2011-01-27 15:24:30.000000000 +0100
@@ -0,0 +1,11 @@
+--- MySQL-python-1.2.2/site_orig.cfg 2007-08-15 12:58:40.000000000 +0200
++++ MySQL-python-1.2.2/site.cfg 2007-08-15 12:58:49.000000000 +0200
diff --git a/patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch b/patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
index b0718e4..7524141 100644
--- a/patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
+++ b/patches/buildroot/2010.11/060-makes_possible_to_compile_linux_in_a_standalone_way_after_configuration.patch
@@ -1,8 +1,8 @@
Index: buildroot/linux/linux.mk
===================================================================
---- buildroot.orig/linux/linux.mk 2010-10-19 09:43:24.000000000 +0200
-+++ buildroot/linux/linux.mk 2010-10-19 09:48:32.000000000 +0200
-@@ -111,6 +111,8 @@
+--- buildroot.orig/linux/linux.mk 2011-01-27 15:24:26.000000000 +0100
++++ buildroot/linux/linux.mk 2011-01-27 15:24:32.000000000 +0100
+@@ -113,6 +113,8 @@
$(call KCONFIG_ENABLE_OPT,CONFIG_INITRAMFS_COMPRESSION_GZIP,$(@D)/.config)
endif
ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
diff --git a/patches/buildroot/2010.11/083-adds_pygame_package.patch b/patches/buildroot/2010.11/083-adds_pygame_package.patch
index 6bc63fb..c6f5d7b 100644
--- a/patches/buildroot/2010.11/083-adds_pygame_package.patch
+++ b/patches/buildroot/2010.11/083-adds_pygame_package.patch
@@ -13,7 +13,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/pygame/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Config.in 2010-06-23 14:11:36.000000000 +0200
++++ buildroot/package/pygame/Config.in 2011-01-27 15:24:42.000000000 +0100
@@ -0,0 +1,92 @@
+config BR2_PACKAGE_PYGAME
+ bool "pygame"
@@ -110,7 +110,7 @@ Index: buildroot/package/pygame/Config.in
Index: buildroot/package/pygame/pygame.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/pygame.mk 2010-06-23 14:11:36.000000000 +0200
++++ buildroot/package/pygame/pygame.mk 2011-01-27 15:24:42.000000000 +0100
@@ -0,0 +1,100 @@
+#
+# Pygame
@@ -214,9 +214,9 @@ Index: buildroot/package/pygame/pygame.mk
+endif
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:11:31.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:11:36.000000000 +0200
-@@ -104,6 +104,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:24:39.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:24:42.000000000 +0100
+@@ -108,6 +108,7 @@
source "package/imagemagick/Config.in"
source "package/linux-fusion/Config.in"
source "package/lite/Config.in"
@@ -227,7 +227,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/pygame/Setup
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pygame/Setup 2010-06-23 14:11:36.000000000 +0200
++++ buildroot/package/pygame/Setup 2011-01-27 15:24:42.000000000 +0100
@@ -0,0 +1,64 @@
+#This Setup file is used by the setup.py script to configure the
+#python extensions. You will likely use the "config.py" which will
diff --git a/patches/buildroot/2010.11/085-adds_gpm_package.patch b/patches/buildroot/2010.11/085-adds_gpm_package.patch
index 3786f30..bbc9469 100644
--- a/patches/buildroot/2010.11/085-adds_gpm_package.patch
+++ b/patches/buildroot/2010.11/085-adds_gpm_package.patch
@@ -5,7 +5,7 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/gpm/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/Config.in 2010-06-23 14:11:42.000000000 +0200
++++ buildroot/package/gpm/Config.in 2011-01-27 15:24:45.000000000 +0100
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GPM
+ bool "gpm mouse server"
@@ -17,7 +17,7 @@ Index: buildroot/package/gpm/Config.in
Index: buildroot/package/gpm/gpm.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm.mk 2010-06-23 14:11:42.000000000 +0200
++++ buildroot/package/gpm/gpm.mk 2011-01-27 15:24:45.000000000 +0100
@@ -0,0 +1,18 @@
+#############################################################
+#
@@ -40,7 +40,7 @@ Index: buildroot/package/gpm/gpm.mk
Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2010-06-23 14:11:42.000000000 +0200
++++ buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch 2011-01-27 15:24:45.000000000 +0100
@@ -0,0 +1,77 @@
+
+Replaces all "obsolete" functions (at least to compile for uClibc).
@@ -121,8 +121,8 @@ Index: buildroot/package/gpm/gpm-1.20.6-removes_obsolete_functions.patch
+ gpm_report (GPM_PR_WARN,"Flag value (%s) for parameter %s is invalid",
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:11:36.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:11:42.000000000 +0200
+--- buildroot.orig/package/Config.in 2011-01-27 15:24:42.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:24:45.000000000 +0100
@@ -173,6 +173,7 @@
source "package/gadgetfs-test/Config.in"
source "package/genext2fs/Config.in"
@@ -134,7 +134,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch 2010-06-23 14:11:42.000000000 +0200
++++ buildroot/package/gpm/gpm-1.20.6-removes_strip_from_install.patch 2011-01-27 15:24:45.000000000 +0100
@@ -0,0 +1,30 @@
+GPM asks "install" to strip the executables while installing it.
+This doesn't seems cross-compiling friendly, so remove the option (-s) and let
diff --git a/patches/buildroot/2010.11/095-uucp-add_packages.patch b/patches/buildroot/2010.11/095-uucp-add_packages.patch
index f3dbd3d..ddeca17 100644
--- a/patches/buildroot/2010.11/095-uucp-add_packages.patch
+++ b/patches/buildroot/2010.11/095-uucp-add_packages.patch
@@ -6,9 +6,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:11:42.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:11:47.000000000 +0200
-@@ -433,6 +433,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:24:45.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:24:47.000000000 +0100
+@@ -449,6 +449,7 @@
source "package/tn5250/Config.in"
source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
@@ -19,7 +19,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/uucp/uucp.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/uucp.mk 2010-06-23 14:11:47.000000000 +0200
++++ buildroot/package/uucp/uucp.mk 2011-01-27 15:24:47.000000000 +0100
@@ -0,0 +1,17 @@
+#############################################################
+#
@@ -41,7 +41,7 @@ Index: buildroot/package/uucp/uucp.mk
Index: buildroot/package/uucp/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/uucp/Config.in 2010-06-23 14:11:47.000000000 +0200
++++ buildroot/package/uucp/Config.in 2011-01-27 15:24:47.000000000 +0100
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UUCP
+ bool "uucp"
diff --git a/patches/buildroot/2010.11/110-bluez-add_package.patch b/patches/buildroot/2010.11/110-bluez-add_package.patch
index c275a5c..6902d29 100644
--- a/patches/buildroot/2010.11/110-bluez-add_package.patch
+++ b/patches/buildroot/2010.11/110-bluez-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:13:01.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:13:05.000000000 +0200
-@@ -364,6 +364,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:24:54.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:24:56.000000000 +0100
+@@ -380,6 +380,7 @@
source "package/boa/Config.in"
endif
source "package/bind/Config.in"
diff --git a/patches/buildroot/2010.11/116-openobex-add_package.patch b/patches/buildroot/2010.11/116-openobex-add_package.patch
index 7521e66..a32ec9f 100644
--- a/patches/buildroot/2010.11/116-openobex-add_package.patch
+++ b/patches/buildroot/2010.11/116-openobex-add_package.patch
@@ -4,10 +4,10 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:13:13.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:13:18.000000000 +0200
-@@ -410,6 +410,7 @@
- source "package/ntp/Config.in"
+--- buildroot.orig/package/Config.in 2011-01-27 15:24:56.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:24:58.000000000 +0100
+@@ -426,6 +426,7 @@
+ source "package/nuttcp/Config.in"
source "package/olsr/Config.in"
source "package/openntpd/Config.in"
+source "package/openobex/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/openobex/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/Config.in 2010-06-23 14:13:18.000000000 +0200
++++ buildroot/package/openobex/Config.in 2011-01-27 15:24:58.000000000 +0100
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_OPENOBEX
+ bool "openobex"
@@ -47,7 +47,7 @@ Index: buildroot/package/openobex/Config.in
Index: buildroot/package/openobex/openobex.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex.mk 2010-06-23 14:13:18.000000000 +0200
++++ buildroot/package/openobex/openobex.mk 2011-01-27 15:24:58.000000000 +0100
@@ -0,0 +1,47 @@
+#############################################################
+#
@@ -99,7 +99,7 @@ Index: buildroot/package/openobex/openobex.mk
Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-23 14:13:18.000000000 +0200
++++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2011-01-27 15:24:58.000000000 +0100
@@ -0,0 +1,13 @@
+Index: openobex-1.5/acinclude.m4
+===================================================================
@@ -117,7 +117,7 @@ Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.pat
Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-23 14:13:18.000000000 +0200
++++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2011-01-27 15:24:58.000000000 +0100
@@ -0,0 +1,25 @@
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
diff --git a/patches/buildroot/2010.11/117-ussp-push-add_package.patch b/patches/buildroot/2010.11/117-ussp-push-add_package.patch
index abdb50e..537bb09 100644
--- a/patches/buildroot/2010.11/117-ussp-push-add_package.patch
+++ b/patches/buildroot/2010.11/117-ussp-push-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:13:18.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:13:23.000000000 +0200
-@@ -438,6 +438,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:24:58.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:25:00.000000000 +0100
+@@ -453,6 +453,7 @@
source "package/tn5250/Config.in"
source "package/ttcp/Config.in"
source "package/udpcast/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/ussp-push/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/Config.in 2010-06-23 14:13:23.000000000 +0200
++++ buildroot/package/ussp-push/Config.in 2011-01-27 15:25:00.000000000 +0100
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_USSP_PUSH
+ bool "ussp-push"
@@ -32,7 +32,7 @@ Index: buildroot/package/ussp-push/Config.in
Index: buildroot/package/ussp-push/ussp-push.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/ussp-push.mk 2010-06-23 14:13:23.000000000 +0200
++++ buildroot/package/ussp-push/ussp-push.mk 2011-01-27 15:25:00.000000000 +0100
@@ -0,0 +1,12 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.11/118-snes9x-add_package.patch b/patches/buildroot/2010.11/118-snes9x-add_package.patch
index 924a42d..b785b00 100644
--- a/patches/buildroot/2010.11/118-snes9x-add_package.patch
+++ b/patches/buildroot/2010.11/118-snes9x-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:13:23.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:13:28.000000000 +0200
-@@ -86,6 +86,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:25:00.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:25:01.000000000 +0100
+@@ -87,6 +87,7 @@
source "package/games/doom-wad/Config.in"
source "package/games/rubix/Config.in"
source "package/games/sdlquake/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/games/snes9x/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/Config.in 2010-06-23 14:13:28.000000000 +0200
++++ buildroot/package/games/snes9x/Config.in 2011-01-27 15:25:01.000000000 +0100
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_SNES9X
+ bool "Snes9X"
@@ -33,7 +33,7 @@ Index: buildroot/package/games/snes9x/Config.in
Index: buildroot/package/games/snes9x/snes9x.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/snes9x.mk 2010-06-23 14:13:28.000000000 +0200
++++ buildroot/package/games/snes9x/snes9x.mk 2011-01-27 15:25:01.000000000 +0100
@@ -0,0 +1,80 @@
+#############################################################
+#
@@ -118,7 +118,7 @@ Index: buildroot/package/games/snes9x/snes9x.mk
Index: buildroot/package/games/snes9x/snes9x-1.39-compile.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/games/snes9x/snes9x-1.39-compile.patch 2010-06-23 14:13:28.000000000 +0200
++++ buildroot/package/games/snes9x/snes9x-1.39-compile.patch 2011-01-27 15:25:01.000000000 +0100
@@ -0,0 +1,295 @@
+
+#
diff --git a/patches/buildroot/2010.11/119-fbtest-add_package.patch b/patches/buildroot/2010.11/119-fbtest-add_package.patch
index 2490f8c..1e8581e 100644
--- a/patches/buildroot/2010.11/119-fbtest-add_package.patch
+++ b/patches/buildroot/2010.11/119-fbtest-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-23 14:13:28.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-23 14:13:31.000000000 +0200
-@@ -102,6 +102,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:25:01.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:25:03.000000000 +0100
+@@ -106,6 +106,7 @@
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/fbset/Config.in"
endif
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/fbtest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/Config.in 2010-06-23 14:13:31.000000000 +0200
++++ buildroot/package/fbtest/Config.in 2011-01-27 15:25:03.000000000 +0100
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_FBTEST
+ bool "fbtest"
@@ -29,7 +29,7 @@ Index: buildroot/package/fbtest/Config.in
Index: buildroot/package/fbtest/fbtest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest.mk 2010-06-23 14:13:31.000000000 +0200
++++ buildroot/package/fbtest/fbtest.mk 2011-01-27 15:25:03.000000000 +0100
@@ -0,0 +1,51 @@
+#############################################################
+#
@@ -85,7 +85,7 @@ Index: buildroot/package/fbtest/fbtest.mk
Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-23 14:13:31.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2011-01-27 15:25:03.000000000 +0100
@@ -0,0 +1,36 @@
+--- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
++++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
@@ -126,7 +126,7 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-23 14:13:31.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2011-01-27 15:25:03.000000000 +0100
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
++++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
@@ -142,7 +142,7 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
Index: buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch 2010-06-23 14:13:31.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch 2011-01-27 15:25:03.000000000 +0100
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/pnmtohex/Makefile 2004-11-02 09:43:02.000000000 +0100
++++ fbtest-20041102-1/pnmtohex/Makefile 2005-11-16 22:24:08.406157582 +0100
diff --git a/patches/buildroot/2010.11/121-target-arm926t_is_arm926ej-s.patch b/patches/buildroot/2010.11/121-target-arm926t_is_arm926ej-s.patch
index 1c9f1f0..754d221 100644
--- a/patches/buildroot/2010.11/121-target-arm926t_is_arm926ej-s.patch
+++ b/patches/buildroot/2010.11/121-target-arm926t_is_arm926ej-s.patch
@@ -5,9 +5,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/target/Config.in.arch
===================================================================
---- buildroot.orig/target/Config.in.arch 2010-06-21 14:55:43.000000000 +0200
-+++ buildroot/target/Config.in.arch 2010-06-21 14:56:15.000000000 +0200
-@@ -72,7 +72,7 @@
+--- buildroot.orig/target/Config.in.arch 2011-01-27 15:22:53.000000000 +0100
++++ buildroot/target/Config.in.arch 2011-01-27 15:25:07.000000000 +0100
+@@ -66,7 +66,7 @@
config BR2_arm922t
bool "arm922t"
config BR2_arm926t
diff --git a/patches/buildroot/2010.11/122-urg-add_package.patch b/patches/buildroot/2010.11/122-urg-add_package.patch
index ba51271..f5bb074 100644
--- a/patches/buildroot/2010.11/122-urg-add_package.patch
+++ b/patches/buildroot/2010.11/122-urg-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-24 09:27:20.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-24 09:27:55.000000000 +0200
-@@ -196,6 +196,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:25:05.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:25:09.000000000 +0100
+@@ -213,6 +213,7 @@
source "package/sshfs/Config.in"
source "package/sysstat/Config.in"
source "package/udev/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/urg/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/urg/Config.in 2010-06-24 09:32:29.000000000 +0200
++++ buildroot/package/urg/Config.in 2011-01-27 15:25:09.000000000 +0100
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_URG
+ bool "urg library"
@@ -31,7 +31,7 @@ Index: buildroot/package/urg/Config.in
Index: buildroot/package/urg/urg.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/urg/urg.mk 2010-06-24 09:29:11.000000000 +0200
++++ buildroot/package/urg/urg.mk 2011-01-27 15:25:09.000000000 +0100
@@ -0,0 +1,21 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.11/123-pywebradio-add_package.patch b/patches/buildroot/2010.11/123-pywebradio-add_package.patch
index 998391b..cf10904 100644
--- a/patches/buildroot/2010.11/123-pywebradio-add_package.patch
+++ b/patches/buildroot/2010.11/123-pywebradio-add_package.patch
@@ -1,8 +1,8 @@
Index: buildroot/package/multimedia/Config.in
===================================================================
---- buildroot.orig/package/multimedia/Config.in 2010-06-27 18:58:38.000000000 +0200
-+++ buildroot/package/multimedia/Config.in 2010-06-29 09:30:18.000000000 +0200
-@@ -23,6 +23,7 @@
+--- buildroot.orig/package/multimedia/Config.in 2011-01-27 15:24:49.000000000 +0100
++++ buildroot/package/multimedia/Config.in 2011-01-27 15:25:10.000000000 +0100
+@@ -26,6 +26,7 @@
source "package/multimedia/madplay/Config.in"
source "package/multimedia/mpg123/Config.in"
source "package/multimedia/mplayer/Config.in"
@@ -13,7 +13,7 @@ Index: buildroot/package/multimedia/Config.in
Index: buildroot/package/pywebradio/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pywebradio/Config.in 2010-06-29 09:30:18.000000000 +0200
++++ buildroot/package/pywebradio/Config.in 2011-01-27 15:25:10.000000000 +0100
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYWEBRADIO
+ bool "pywebradio"
@@ -24,7 +24,7 @@ Index: buildroot/package/pywebradio/Config.in
Index: buildroot/package/pywebradio/pywebradio.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/pywebradio/pywebradio.mk 2010-07-04 18:13:38.000000000 +0200
++++ buildroot/package/pywebradio/pywebradio.mk 2011-01-27 15:25:10.000000000 +0100
@@ -0,0 +1,28 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.11/124-e-uae-add_package.patch b/patches/buildroot/2010.11/124-e-uae-add_package.patch
index bf9a632..990162c 100644
--- a/patches/buildroot/2010.11/124-e-uae-add_package.patch
+++ b/patches/buildroot/2010.11/124-e-uae-add_package.patch
@@ -1,8 +1,8 @@
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-29 11:20:37.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-04 18:03:11.000000000 +0200
-@@ -79,6 +79,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:25:09.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:25:12.000000000 +0100
+@@ -80,6 +80,7 @@
menu "Games"
source "package/games/ace_of_penguins/Config.in"
@@ -13,7 +13,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/e-uae/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/e-uae/Config.in 2010-07-04 18:05:06.000000000 +0200
++++ buildroot/package/e-uae/Config.in 2011-01-27 15:25:12.000000000 +0100
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_E_UAE
+ bool "e-uae"
@@ -27,7 +27,7 @@ Index: buildroot/package/e-uae/Config.in
Index: buildroot/package/e-uae/e-uae.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/e-uae/e-uae.mk 2010-07-04 18:06:43.000000000 +0200
++++ buildroot/package/e-uae/e-uae.mk 2011-01-27 15:25:12.000000000 +0100
@@ -0,0 +1,23 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.11/130-lbreakout-add_package.patch b/patches/buildroot/2010.11/130-lbreakout-add_package.patch
index 3d447ce..72cb9c5 100644
--- a/patches/buildroot/2010.11/130-lbreakout-add_package.patch
+++ b/patches/buildroot/2010.11/130-lbreakout-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-07-14 19:25:49.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-15 09:03:49.000000000 +0200
-@@ -81,6 +81,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:25:13.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:25:16.000000000 +0100
+@@ -82,6 +82,7 @@
source "package/games/ace_of_penguins/Config.in"
source "package/e-uae/Config.in"
source "package/games/gnuchess/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/lbreakout2/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lbreakout2/Config.in 2010-07-14 23:27:44.000000000 +0200
++++ buildroot/package/lbreakout2/Config.in 2011-01-27 15:25:16.000000000 +0100
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_LBREAKOUT2
+ bool "LBreakout2"
@@ -48,7 +48,7 @@ Index: buildroot/package/lbreakout2/Config.in
Index: buildroot/package/lbreakout2/lbreakout2.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/lbreakout2/lbreakout2.mk 2010-07-15 09:04:51.000000000 +0200
++++ buildroot/package/lbreakout2/lbreakout2.mk 2011-01-27 15:25:16.000000000 +0100
@@ -0,0 +1,29 @@
+#############################################################
+#
diff --git a/patches/buildroot/2010.11/131-ltetris-add_package.patch b/patches/buildroot/2010.11/131-ltetris-add_package.patch
index d6fcf6f..ec1f53a 100644
--- a/patches/buildroot/2010.11/131-ltetris-add_package.patch
+++ b/patches/buildroot/2010.11/131-ltetris-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-07-15 09:03:49.000000000 +0200
-+++ buildroot/package/Config.in 2010-07-15 09:05:10.000000000 +0200
-@@ -82,6 +82,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:25:16.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:25:18.000000000 +0100
+@@ -83,6 +83,7 @@
source "package/e-uae/Config.in"
source "package/games/gnuchess/Config.in"
source "package/lbreakout2/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/ltris/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ltris/Config.in 2010-07-15 09:05:10.000000000 +0200
++++ buildroot/package/ltris/Config.in 2011-01-27 15:25:18.000000000 +0100
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LTRIS
+ bool "LTris"
@@ -37,7 +37,7 @@ Index: buildroot/package/ltris/Config.in
Index: buildroot/package/ltris/ltris.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ltris/ltris.mk 2010-07-15 09:05:10.000000000 +0200
++++ buildroot/package/ltris/ltris.mk 2011-01-27 15:25:18.000000000 +0100
@@ -0,0 +1,23 @@
+#############################################################
+#
@@ -65,7 +65,7 @@ Index: buildroot/package/ltris/ltris.mk
Index: buildroot/package/ltris/ltris-force_screen_res.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ltris/ltris-force_screen_res.patch 2010-07-15 10:20:24.000000000 +0200
++++ buildroot/package/ltris/ltris-force_screen_res.patch 2011-01-27 15:25:18.000000000 +0100
@@ -0,0 +1,15 @@
+Force 640x480x16 fullscreen mode.
+A cleaner way should exist...
diff --git a/patches/buildroot/2010.11/133-qwt-add_package.patch b/patches/buildroot/2010.11/133-qwt-add_package.patch
index b60d4d2..e88e2bf 100644
--- a/patches/buildroot/2010.11/133-qwt-add_package.patch
+++ b/patches/buildroot/2010.11/133-qwt-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-10-06 15:24:45.000000000 +0200
-+++ buildroot/package/Config.in 2010-10-06 15:26:58.000000000 +0200
-@@ -129,6 +129,7 @@
+--- buildroot.orig/package/Config.in 2011-01-27 15:25:18.000000000 +0100
++++ buildroot/package/Config.in 2011-01-27 15:25:21.000000000 +0100
+@@ -130,6 +130,7 @@
comment "other GUIs"
source "package/qt/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/qwt/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/Config.in 2010-10-06 15:26:58.000000000 +0200
++++ buildroot/package/qwt/Config.in 2011-01-27 15:25:21.000000000 +0100
@@ -0,0 +1,20 @@
+comment "Qwt requires Qt to be installed"
+ depends on !BR2_PACKAGE_QT
@@ -42,7 +42,7 @@ Index: buildroot/package/qwt/Config.in
Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2010-10-06 15:26:58.000000000 +0200
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch 2011-01-27 15:25:21.000000000 +0100
@@ -0,0 +1,30 @@
+--- qwt-5.2.1/qwtconfig.pri.orig 2010-09-28 14:34:01.000000000 +0200
++++ qwt-5.2.1/qwtconfig.pri 2010-09-28 15:37:02.000000000 +0200
@@ -77,7 +77,7 @@ Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
Index: buildroot/package/qwt/qwt.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt.mk 2010-10-06 15:35:59.000000000 +0200
++++ buildroot/package/qwt/qwt.mk 2011-01-27 15:25:21.000000000 +0100
@@ -0,0 +1,82 @@
+######################################################################
+#
diff --git a/patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch b/patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch
index 82cc473..dd47a5f 100644
--- a/patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch
+++ b/patches/buildroot/2010.11/134-jffs2-add_board_name_to_binary_rootfs_name.patch
@@ -6,11 +6,11 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/fs/common.mk
===================================================================
---- buildroot.orig/fs/common.mk 2010-10-19 09:32:19.000000000 +0200
-+++ buildroot/fs/common.mk 2010-10-19 09:33:11.000000000 +0200
-@@ -36,8 +36,8 @@
-
- define ROOTFS_TARGET_INTERNAL
+--- buildroot.orig/fs/common.mk 2011-01-27 15:22:52.000000000 +0100
++++ buildroot/fs/common.mk 2011-01-27 15:25:22.000000000 +0100
+@@ -39,8 +39,8 @@
+ # extra deps
+ $(eval ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs $(if $(BR2_TARGET_ROOTFS_$(2)_LZMA),host-lzma))
-$(BINARIES_DIR)/rootfs.$(1): $(ROOTFS_$(2)_DEPENDENCIES)
- @$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
@@ -19,7 +19,7 @@ Index: buildroot/fs/common.mk
$(foreach hook,$(ROOTFS_$(2)_PRE_GEN_HOOKS),$(call $(hook))$(sep))
rm -f $(FAKEROOT_SCRIPT)
touch $(BUILD_DIR)/.fakeroot.00000
-@@ -64,7 +64,7 @@
+@@ -67,7 +67,7 @@
rootfs-$(1)-show-depends:
@echo $(ROOTFS_$(2)_DEPENDENCIES)
diff --git a/patches/buildroot/2010.11/141-qt-fix_mysql_module.patch b/patches/buildroot/2010.11/141-qt-fix_mysql_module.patch
index 487c9a4..4e47fd6 100644
--- a/patches/buildroot/2010.11/141-qt-fix_mysql_module.patch
+++ b/patches/buildroot/2010.11/141-qt-fix_mysql_module.patch
@@ -3,11 +3,11 @@ Fix Qt configuration options for MySQL module ; Specifies the MySQL's libraries
Signed-off-by: Jérémie Scheer <jer...@ar...>
===================================================================
-diff --git a/package/qt/qt.mk b/package/qt/qt.mk
-index 2b5b31b..6eb31bc 100644
---- a/package/qt/qt.mk
-+++ b/pack...
[truncated message content] |
|
From: Julien B a. A. <ar...@us...> - 2011-01-27 21:50:54
|
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 519b0d140ee152ebbc83f686319212bcd6cad803 (commit)
from 3542a79335258159573a42d7a8273f229eb0f0b5 (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 519b0d140ee152ebbc83f686319212bcd6cad803
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 27 22:49:57 2011 +0100
[BUILDROOT] 2010.11: Makes as_devices lib compile again
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/as_devices/as_devices.mk | 2 +-
target/packages/as_devices/Makefile | 5 ++---
target/packages/as_devices/c/Makefile | 12 +++---------
target/packages/as_devices/c/as_max1027.c | 16 ++++++++++++++--
4 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 892ac77..678068e 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -59,7 +59,7 @@ $(TARGET_DIR)/$(AS_DEVICES_CPP_TARGET_BINARY): $(AS_DEVICES_DIR)/cpp/$(AS_DEVICE
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(AS_DEVICES_CPP_TARGET_BINARY)
$(AS_DEVICES_DIR)/cpp/$(AS_DEVICES_CPP_BINARY): $(AS_DEVICES_DIR)/Makefile
- $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX=$(TARGET_CXX) -C $(AS_DEVICES_DIR)/cpp
+ $(TARGET_CONFIGURE_OPTS) $(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" -C $(AS_DEVICES_DIR)/cpp
endif
ifeq ($(strip $(BR2_PACKAGE_AS_DEVICES_PYTHON)),y)
diff --git a/target/packages/as_devices/Makefile b/target/packages/as_devices/Makefile
index 7acc524..d052b39 100644
--- a/target/packages/as_devices/Makefile
+++ b/target/packages/as_devices/Makefile
@@ -1,15 +1,14 @@
# Default values for local compiling:
ARMADEUS_BASE_DIR=../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
CFLAGS=-Wall -g -O0
-
LDFLAGS=
CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
CXX:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-g++
STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
INSTALL_DIR:=$(ARMADEUS_STAGING_DIR)
+
C_BINARY=test_cdevices
C_LIBNAME=libas_devices.so
C_LIB=c/$(C_LIBNAME)
diff --git a/target/packages/as_devices/c/Makefile b/target/packages/as_devices/c/Makefile
index 159646f..d91a725 100644
--- a/target/packages/as_devices/c/Makefile
+++ b/target/packages/as_devices/c/Makefile
@@ -1,17 +1,11 @@
# Default values for local compiling:
-#
-ifeq ($(KERNEL_INCLUDE),)
-ARMADEUS_BASE_DIR=../../../../
-include $(ARMADEUS_BASE_DIR)/Makefile.in
-KERNEL_INCLUDE=$(ARMADEUS_LINUX_DIR)/include/
+ARMADEUS_BASE_DIR=../../../../../
+-include $(ARMADEUS_BASE_DIR)/Makefile.in
CFLAGS+= -Wall -g -O0
-CFLAGS+= -I$(KERNEL_INCLUDE)
-endif
-
LDFLAGS=
CC:=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
STRIP:=$(ARMADEUS_TOOLCHAIN_PATH)arm-linux-sstrip
-CFLAGS+=
+
OBJ = as_pwm.o
OBJ += as_i2c.o
diff --git a/target/packages/as_devices/c/as_max1027.c b/target/packages/as_devices/c/as_max1027.c
index c6e3aa9..52b0752 100644
--- a/target/packages/as_devices/c/as_max1027.c
+++ b/target/packages/as_devices/c/as_max1027.c
@@ -31,10 +31,22 @@
///XXX: find where u8 is defined under linux
typedef unsigned char u8;
-#include <linux/spi/max1027.h>
#include "as_max1027.h"
-//#define ERROR_MSG
+/* Redundant with <linux/spi/max1027.h>, but... */
+/* 00 : Scans channels 0 through N.
+ * 01 : Scans channels N through the highest numbered channel.
+ * 10 : Scans channel N repeatedly. The averaging register sets the number of results
+ * 11 : No scan. Converts channel N once only. */
+#define SCAN_MODE_00 0
+#define SCAN_MODE_01 1
+#define SCAN_MODE_10 2
+#define SCAN_MODE_11 3
+#define MAX1027_CONV 0x80
+#define MAX1027_CONV_TEMP 0x01
+#define MAX1027_SETUP 0x40
+#define MAX1027_AVG 0x20
+
#define BUFFER_SIZE (70)
#define PATH_SIZE (50)
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-01-27 16:35:37
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3542a79335258159573a42d7a8273f229eb0f0b5 (commit)
via 073f7d64df30594ada0cc3cb2e52f9b4390d5eaa (commit)
from 5993d32c67a6147d7480139ae5590a70beb34593 (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 3542a79335258159573a42d7a8273f229eb0f0b5
Merge: 073f7d64df30594ada0cc3cb2e52f9b4390d5eaa 5993d32c67a6147d7480139ae5590a70beb34593
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 27 17:27:55 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 073f7d64df30594ada0cc3cb2e52f9b4390d5eaa
Author: Julien Boibessot <jul...@ar...>
Date: Thu Jan 27 17:27:34 2011 +0100
[BUILDROOT] 2010.11: Activates boot console selection in BR menuconfig
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 39 ++++++++++++++------
buildroot/configs/apf9328_defconfig | 28 +++++++++++++-
buildroot/configs/pps_defconfig | 28 +++++++++++++-
.../armadeus/rootfs/target_skeleton/etc/inittab | 3 +-
4 files changed, 80 insertions(+), 18 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 4d3fea5..ca497c7 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Dec 28 18:08:43 2010
+# Thu Jan 27 17:13:40 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -55,26 +55,41 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
# Preset Devices
#
BR2_TARGET_ARMADEUS=y
-# BR2_TARGET_ARMADEUS_APF9328 is not set
-# BR2_TARGET_ARMADEUS_APF27_DEV is not set
-BR2_TARGET_ARMADEUS_APF51=y
-# BR2_TARGET_ARMADEUS_APF27_PPS is not set
BR2_BOARD_NAME="apf51"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx51"
BR2_TARGET_ARMADEUS_NR_SDRAM="1"
-BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_1=y
-# BR2_TARGET_ARMADEUS_APF51_NB_DDR2RAM_2 is not set
-# BR2_TARGET_ARMADEUS_APF51_DDR2RAM_32 is not set
-# BR2_TARGET_ARMADEUS_APF51_DDR2RAM_64 is not set
-BR2_TARGET_ARMADEUS_APF51_DDR2RAM_128=y
-# BR2_TARGET_ARMADEUS_APF51_DDR2RAM_256 is not set
+BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
# BR2_TARGET_ARMLTD is not set
# BR2_TARGET_ATMEL is not set
# BR2_TARGET_KWIKBYTE is not set
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
-# BR2_TARGET_GENERIC_GETTY is not set
+BR2_TARGET_GENERIC_GETTY=y
+# BR2_TARGET_GENERIC_GETTY_NONE is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYMXC0 is not set
+BR2_TARGET_GENERIC_GETTY_TTYMXC1=y
+# BR2_TARGET_GENERIC_GETTY_TTYMXC2 is not set
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set
+BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
+BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Build options
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index bb9ef17..46bd0b1 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Oct 19 15:36:56 2010
+# Thu Jan 27 17:13:40 2011
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -65,7 +65,31 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
# BR2_TARGET_KWIKBYTE is not set
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
-# BR2_TARGET_GENERIC_GETTY is not set
+BR2_TARGET_GENERIC_GETTY=y
+# BR2_TARGET_GENERIC_GETTY_NONE is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC3 is not set
+BR2_TARGET_GENERIC_GETTY_TTYMXC0=y
+# BR2_TARGET_GENERIC_GETTY_TTYMXC1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYMXC2 is not set
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set
+BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
+BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Build options
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 1028d2b..a7851be 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Wed Jan 12 11:33:44 2011
+# Mon Nov 1 17:03:11 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
@@ -65,7 +65,31 @@ BR2_TARGET_ARMADEUS_SDRAM_SIZE="64"
# BR2_TARGET_KWIKBYTE is not set
BR2_TARGET_GENERIC_HOSTNAME="armadeus"
BR2_TARGET_GENERIC_ISSUE="Welcome to the Armadeus development environment."
-# BR2_TARGET_GENERIC_GETTY is not set
+BR2_TARGET_GENERIC_GETTY=y
+# BR2_TARGET_GENERIC_GETTY_NONE is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYS3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYAMA3 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC0 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC2 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYSAC3 is not set
+BR2_TARGET_GENERIC_GETTY_TTYMXC0=y
+# BR2_TARGET_GENERIC_GETTY_TTYMXC1 is not set
+# BR2_TARGET_GENERIC_GETTY_TTYMXC2 is not set
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_38400 is not set
+# BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 is not set
+BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
+BR2_TARGET_GENERIC_GETTY_BAUDRATE="115200"
#
# Build options
diff --git a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab
index 7a940c4..08ca4d4 100644
--- a/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab
+++ b/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab
@@ -35,8 +35,7 @@ tty1::respawn:/sbin/getty 38400 tty1
#tty2::respawn:/sbin/getty 38400 tty2
# Put a getty on the serial port
-#ttyS0::respawn:/sbin/getty -L ttySMX0 115200,57600,38400,230400 vt100
-ttySMX0::respawn:/sbin/getty -L ttySMX0 115200,57600,38400 vt100
+ttySMX0::respawn:/sbin/getty -L ttySMX0 115200,57600,38400 vt100 # GENERIC_SERIAL
#null::respawn:/sbin/getty -L ttygserial 115200 vt100
# Logging junk
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-01-26 15:38:28
|
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 95306460dd64419460b64a419e654522e5ce705a (commit)
via fe861f7e79249c1ca4b51e62b79e39cdbe053f5b (commit)
from 987dd443499c7ca14da4c86a12614f35949c80e2 (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 95306460dd64419460b64a419e654522e5ce705a
Merge: fe861f7e79249c1ca4b51e62b79e39cdbe053f5b 987dd443499c7ca14da4c86a12614f35949c80e2
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 26 16:37:38 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit fe861f7e79249c1ca4b51e62b79e39cdbe053f5b
Author: Julien Boibessot <jul...@ar...>
Date: Wed Jan 26 16:37:13 2011 +0100
[BUILDROOT] 2010.11: ncurses-5.7: allows compilation even with old ncurses host installations
-----------------------------------------------------------------------
Summary of changes:
...42-ncurses-fix_compilation_with_old_hosts.patch | 25 ++++++++++++++++++++
patches/buildroot/2010.11/cleanup_buildroot.sh | 1 +
2 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2010.11/142-ncurses-fix_compilation_with_old_hosts.patch
diff --git a/patches/buildroot/2010.11/142-ncurses-fix_compilation_with_old_hosts.patch b/patches/buildroot/2010.11/142-ncurses-fix_compilation_with_old_hosts.patch
new file mode 100644
index 0000000..dab5b77
--- /dev/null
+++ b/patches/buildroot/2010.11/142-ncurses-fix_compilation_with_old_hosts.patch
@@ -0,0 +1,25 @@
+Old ncurses Host installation complains if tic is launched with -x option, so
+remove it.
+
+Bug & correction reporter: Loic Bartel.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch 2011-01-26 14:27:29.000000000 +0100
+@@ -0,0 +1,13 @@
++Index: ncurses-5.7/misc/run_tic.in
++===================================================================
++--- ncurses-5.7.org/misc/run_tic.in 2011-01-26 13:34:27.000000000 +0100
+++++ ncurses-5.7/misc/run_tic.in 2011-01-26 13:34:44.000000000 +0100
++@@ -110,7 +110,7 @@
++ document, and install the terminfo without the -x option.
++
++ EOF
++-if ( $SHLIB tic$suffix -x -s -o $TERMINFO $source )
+++if ( $SHLIB tic$suffix -s -o $TERMINFO $source )
++ then
++ echo '** built new '$TERMINFO
++ else
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index 445ede6..fd8d896 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -47,3 +47,4 @@ rm -rf buildroot/package/ltris/
rm -rf buildroot/package/qwt/
rm -rf buildroot/fs/ubi/
rm -f buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch
+rm -f buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2011-01-25 22:00: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 987dd443499c7ca14da4c86a12614f35949c80e2 (commit)
from 018bed243fa1fb6d06459c6dc3e8f3088de31b41 (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 987dd443499c7ca14da4c86a12614f35949c80e2
Author: Eric Jarrige <eri...@ar...>
Date: Tue Jan 25 23:01:23 2011 +0100
[BUILDROOT] 2010.11:Support CONFIG_SYS prefix for macros as define and requested in U-Boot 2010.xx
-----------------------------------------------------------------------
Summary of changes:
...boot-support_config_sys_naming_convention.patch | 24 ++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
create mode 100644 patches/buildroot/2010.11/051i-u-boot-support_config_sys_naming_convention.patch
diff --git a/patches/buildroot/2010.11/051i-u-boot-support_config_sys_naming_convention.patch b/patches/buildroot/2010.11/051i-u-boot-support_config_sys_naming_convention.patch
new file mode 100644
index 0000000..51c0052
--- /dev/null
+++ b/patches/buildroot/2010.11/051i-u-boot-support_config_sys_naming_convention.patch
@@ -0,0 +1,24 @@
+Support CONFIG_SYS prefix for macros as define and requested in U-Boot 2010.xx
+coding rules
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+
+Index: buildroot/boot/u-boot/u-boot.mk
+===================================================================
+--- buildroot.orig/boot/u-boot/u-boot.mk 2011-01-20 23:21:24.000000000 +0100
++++ buildroot/boot/u-boot/u-boot.mk 2011-01-25 22:41:46.000000000 +0100
+@@ -151,10 +151,14 @@ endif
+ ifneq ($(BR2_TARGET_ARMADEUS_SDRAM_SIZE),)
+ $(SED) "s,^#define CFG_SDRAM_MBYTE_SYZE.*,#define CFG_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
+ $(U_BOOT_INC_CONF_FILE)
++ $(SED) "s,^#define CONFIG_SYS_SDRAM_MBYTE_SYZE.*,#define CONFIG_SYS_SDRAM_MBYTE_SYZE $(BR2_TARGET_ARMADEUS_SDRAM_SIZE),g;"\
++ $(U_BOOT_INC_CONF_FILE)
+ endif
+ ifneq ($(BR2_TARGET_ARMADEUS_NR_SDRAM),)
+ $(SED) "s,^#define CONFIG_NR_DRAM_BANKS.*,#define CONFIG_NR_DRAM_BANKS $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
+ $(U_BOOT_INC_CONF_FILE)
++ $(SED) "s,^#define CONFIG_SYS_NR_DRAM_BANKS.*,#define CONFIG_SYS_NR_DRAM_BANKS $(BR2_TARGET_ARMADEUS_NR_SDRAM),g;"\
++ $(U_BOOT_INC_CONF_FILE)
+ endif
+ touch $@
+
hooks/post-receive
--
armadeus
|
|
From: jorasse <jo...@us...> - 2011-01-24 22:33: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 018bed243fa1fb6d06459c6dc3e8f3088de31b41 (commit)
via 070b1ef28b145dc872afdb6de85a386079449880 (commit)
via 92533c9cdea011738afd7f104bcd59ae6d2585b6 (commit)
from 4c63cce01cadb106f32d9bc03c790a238199b859 (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 018bed243fa1fb6d06459c6dc3e8f3088de31b41
Merge: 070b1ef28b145dc872afdb6de85a386079449880 4c63cce01cadb106f32d9bc03c790a238199b859
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jan 24 23:40:10 2011 +0100
Merge branch 'master' of ssh://jorasse@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 070b1ef28b145dc872afdb6de85a386079449880
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jan 24 23:39:03 2011 +0100
[UBOOT] Check new compatibility version of environment variables
commit 92533c9cdea011738afd7f104bcd59ae6d2585b6
Author: Eric Jarrige <eri...@ar...>
Date: Mon Jan 24 23:32:30 2011 +0100
[UBOOT] Fix default rootfs filename
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 6 +++---
.../target/u-boot/u-boot-2010.03-401-apf51.patch | 9 ++++++++-
2 files changed, 11 insertions(+), 4 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 c69d0fb..f694e6b 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,8 +26,8 @@
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.3"
-#define CONFIG_IDENT_STRING " apf51 patch 0.2"
+#define CONFIG_ENV_VERSION "0.4"
+#define CONFIG_IDENT_STRING " apf51 patch 0.4"
/* High Level Configuration Options */
#define CONFIG_ARMV7 1 /* This is armv7 Cortex-A8 CPU */
@@ -211,7 +211,7 @@
"download_kernel=tftpboot ${loadaddr} " \
" ${serverpath}${board_name}-linux.bin\0" \
"download_rootfs=tftpboot ${loadaddr} " \
- " ${serverpath}${board_name}-rootfs.arm.ubi\0" \
+ " ${serverpath}${board_name}-rootfs.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/u-boot/u-boot-2010.03-401-apf51.patch b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
index fc84bc9..6bb476e 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
@@ -2,7 +2,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2010.03/board/armadeus/apf51/apf51.c 2011-01-05 18:11:15.000000000 +0100
-@@ -0,0 +1,1102 @@
+@@ -0,0 +1,1109 @@
+/*
+ * (C) Copyright 2010 Eric Jarrige, Armadeus Project
+ *
@@ -916,6 +916,13 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
+ APF51_init_fpga (firmware_buffer, size);
+#endif
+
++ /* detect compatibility issue of environment version */
++ s = getenv ("env_version");
++ if (( NULL == s ) || (0 != strcmp(s, CONFIG_ENV_VERSION))) {
++ printf("*** Warning - Environment version change suggests: "
++ "run flash_reset_env; reset\n");
++ }
++
+ return 0;
+}
+
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-01-24 17:25:28
|
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 4c63cce01cadb106f32d9bc03c790a238199b859 (commit)
from cdd606fc40cf841b6890bf17bcc5b65926fef557 (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 4c63cce01cadb106f32d9bc03c790a238199b859
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jan 24 18:24:31 2011 +0100
[BUILDROOT] Cleanup pps/Config.in
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/armadeus/pps/Config.in | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/buildroot/package/armadeus/pps/Config.in b/buildroot/package/armadeus/pps/Config.in
index bd38451..69fbff8 100644
--- a/buildroot/package/armadeus/pps/Config.in
+++ b/buildroot/package/armadeus/pps/Config.in
@@ -1,18 +1,16 @@
config BR2_PACKAGE_ARMADEUS_PPS_UTILITIES
bool "PPS Utilities"
- default n
help
- Install PPS Utilities & Initialization files to make PPS' fonctionalities work:
- - GPIOs initialization file
+ Install PPS utilities & initialization scripts needed for:
+ - GPIOs initialization
- Guest user creation to connect to PPS via SSH
if BR2_PACKAGE_ARMADEUS_PPS_UTILITIES
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 in /usr/local/pps/scripts.
+ Install PPS test scripts for Ethernet, WiFi & USB Gadget.
+ Scripts will be installed in /usr/local/pps/scripts.
-endif #BR2_PACKAGE_ARMADEUS_PPS_UTILITIES
+endif
hooks/post-receive
--
armadeus
|
|
From: Julien B a. A. <ar...@us...> - 2011-01-21 09:40:03
|
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 cdd606fc40cf841b6890bf17bcc5b65926fef557 (commit)
via b1e5f15a9b5607ccce5f5546b22e2a452c9ab509 (commit)
from c9da409ef59cc997d6468933139c664b4e2eac0d (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 cdd606fc40cf841b6890bf17bcc5b65926fef557
Merge: b1e5f15a9b5607ccce5f5546b22e2a452c9ab509 c9da409ef59cc997d6468933139c664b4e2eac0d
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 21 10:39:27 2011 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit b1e5f15a9b5607ccce5f5546b22e2a452c9ab509
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jan 21 10:29:41 2011 +0100
[LINUX] 2.6.38 Updates wm831x to state of the art (2)
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/400-armadeus-add_apf51_module.patch | 15 ++--
...us-wm8311-add_CMOS_IRQ_line_configuration.patch | 18 ----
...-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch | 46 ++++++------
..._configuration_of_IRQ_output_in_CMOS_mode.patch | 51 ++++++++++++
...deus-input-wm831x-makes_touch_driver_work.patch | 84 --------------------
.../417-armadeus-input-wm831x-driver_hacks.patch | 10 +-
6 files changed, 87 insertions(+), 137 deletions(-)
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-armadeus-wm8311-add_CMOS_IRQ_line_configuration.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch
delete mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/416-armadeus-input-wm831x-makes_touch_driver_work.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index 121def2..df005d8 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-06 15:53:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-06 19:58:51.000000000 +0100
+--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Kconfig 2011-01-21 09:27:13.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig 2011-01-21 09:58:04.000000000 +0100
@@ -101,4 +101,17 @@
Include support for Genesi Efika MX nettop. This includes specific
configurations for the board and its peripherals.
@@ -23,7 +23,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Kconfig
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
===================================================================
--- linux-2.6.38-alpha.orig/arch/arm/mach-mx5/Makefile 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-06 19:58:51.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile 2011-01-21 09:58:04.000000000 +0100
@@ -6,6 +6,7 @@
obj-y := cpu.o mm.o clock-mx51-mx53.o devices.o
@@ -35,8 +35,8 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c 2011-01-06 18:51:58.000000000 +0100
-@@ -0,0 +1,422 @@
++++ linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c 2011-01-21 09:43:53.000000000 +0100
+@@ -0,0 +1,423 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus Systems
@@ -389,6 +389,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
+
+static struct wm831x_pdata apf51_wm8311_pdata = {
+ .pre_init = apf51_wm8311_pre_init,
++ .irq_cmos = 1,
+ .irq_base = MXC_BOARD_IRQ_START,
+#if 0
+ .gpio_base = GPIO_BOARD_START,
@@ -462,7 +463,7 @@ Index: linux-2.6.38-alpha/arch/arm/mach-mx5/board-apf51.c
Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
--- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h 2011-01-06 15:53:53.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h 2011-01-21 09:27:13.000000000 +0100
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -484,7 +485,7 @@ Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/uncompress.h
Index: linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
--- linux-2.6.38-alpha.orig/arch/arm/plat-mxc/include/mach/irqs.h 2010-12-14 09:55:53.000000000 +0100
-+++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h 2011-01-06 15:53:53.000000000 +0100
++++ linux-2.6.38-alpha/arch/arm/plat-mxc/include/mach/irqs.h 2011-01-21 09:27:13.000000000 +0100
@@ -47,6 +47,8 @@
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-armadeus-wm8311-add_CMOS_IRQ_line_configuration.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-armadeus-wm8311-add_CMOS_IRQ_line_configuration.patch
deleted file mode 100644
index 93f2b6b..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/411-armadeus-wm8311-add_CMOS_IRQ_line_configuration.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Configure "IRQ" line as CMOS.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.38-alpha/drivers/mfd/wm831x-core.c
-===================================================================
---- linux-2.6.38-alpha.orig/drivers/mfd/wm831x-core.c 2010-12-29 10:33:41.000000000 +0100
-+++ linux-2.6.38-alpha/drivers/mfd/wm831x-core.c 2010-12-29 10:35:59.000000000 +0100
-@@ -1571,6 +1571,9 @@
- }
- }
-
-+ /* Configure "IRQ" line as CMOS */
-+ wm831x_reg_write(wm831x, WM831X_IRQ_CONFIG, 0);
-+
- ret = wm831x_irq_init(wm831x, irq);
- if (ret != 0)
- goto err;
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch
index eec40f2..a30cb6d 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/412-wolfson-Input-wm831x-Add-driver-for-Wolfson-WM831x-PMIC-touch.patch
@@ -1,4 +1,4 @@
->From a449c9de202f2a970a1e1e856da19fb9531f7ded Mon Sep 17 00:00:00 2001
+>From a1ae1fa080f0d352f044c97f9c469e3275235402 Mon Sep 17 00:00:00 2001
From: Mark Brown <br...@op...>
Date: Fri, 14 Jan 2011 15:07:22 +0000
Subject: [PATCH] Input: wm831x - Add driver for Wolfson WM831x PMIC touchscreen controllers
@@ -59,7 +59,7 @@ index 718bcc8..e8dcfab 100644
wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o
diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
new file mode 100644
-index 0000000..a424a80
+index 0000000..9a58a11
--- /dev/null
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -0,0 +1,399 @@
@@ -164,8 +164,8 @@ index 0000000..a424a80
+ struct wm831x *wm831x;
+ int data_irq;
+ int pd_irq;
-+ int rate;
+ bool pressure;
++ bool pen_down;
+};
+
+static irqreturn_t wm831x_ts_data_irq(int irq, void *irq_data)
@@ -174,7 +174,6 @@ index 0000000..a424a80
+ struct wm831x *wm831x = wm831x_ts->wm831x;
+ static int data_types[] = { ABS_X, ABS_Y, ABS_PRESSURE };
+ u16 data[3];
-+ bool pen_down = true;
+ int count, i, ret;
+
+ wm831x_set_bits(wm831x, WM831X_INTERRUPT_STATUS_1,
@@ -196,25 +195,24 @@ index 0000000..a424a80
+ /* We get a pen down reading on every reading, report pen up if any
+ * individual reading does so.
+ */
++ wm831x_ts->pen_down = true;
+ for (i = 0; i < count; i++) {
+ if (!(data[i] & WM831X_TCH_PD)) {
-+ pen_down = false;
++ wm831x_ts->pen_down = false;
+ continue;
+ }
+ input_report_abs(wm831x_ts->input_dev, data_types[i],
+ data[i] & WM831X_TCH_DATA_MASK);
+ }
+
-+ if (!pen_down) {
++ if (!wm831x_ts->pen_down) {
++ disable_irq_nosync(wm831x_ts->data_irq);
++
+ /* Don't need data any more */
+ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
+ WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
+ WM831X_TCH_Z_ENA, 0);
+
-+ /* Drop the conversion rate while pen is up */
-+ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-+ WM831X_TCH_RATE_MASK, 0);
-+
+ if (wm831x_ts->pressure)
+ input_report_abs(wm831x_ts->input_dev,
+ ABS_PRESSURE, 0);
@@ -233,13 +231,9 @@ index 0000000..a424a80
+ struct wm831x *wm831x = wm831x_ts->wm831x;
+ int ena;
+
-+ /* Raise conversion rate to normal rate */
-+ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-+ WM831X_TCH_RATE_MASK, wm831x_ts->rate);
-+
+ /* Start collecting data */
+ if (wm831x_ts->pressure)
-+ ena |= WM831X_TCH_Z_ENA;
++ ena = WM831X_TCH_Z_ENA;
+ else
+ ena = 0;
+
@@ -253,6 +247,9 @@ index 0000000..a424a80
+ wm831x_set_bits(wm831x, WM831X_INTERRUPT_STATUS_1,
+ WM831X_TCHPD_EINT, WM831X_TCHPD_EINT);
+
++ wm831x_ts->pen_down = true;
++ enable_irq(wm831x_ts->data_irq);
++
+ return IRQ_HANDLED;
+}
+
@@ -279,6 +276,9 @@ index 0000000..a424a80
+ WM831X_TCH_ENA | WM831X_TCH_CVT_ENA |
+ WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
+ WM831X_TCH_Z_ENA, 0);
++
++ if (wm831x_ts->pen_down)
++ disable_irq_nosync(wm831x_ts->pen_down);
+}
+
+static __devinit int wm831x_ts_probe(struct platform_device *pdev)
@@ -307,14 +307,12 @@ index 0000000..a424a80
+ if (pdata && pdata->data_irq)
+ wm831x_ts->data_irq = pdata->data_irq;
+ else
-+ wm831x_ts->data_irq = platform_get_irq_byname(pdev,
-+ "TCHDATA");
++ wm831x_ts->data_irq = platform_get_irq_byname(pdev, "TCHDATA");
+
+ if (pdata && pdata->pd_irq)
+ wm831x_ts->pd_irq = pdata->pd_irq;
+ else
-+ wm831x_ts->data_irq = platform_get_irq_byname(pdev,
-+ "TCHPD");
++ wm831x_ts->pd_irq = platform_get_irq_byname(pdev, "TCHPD");
+
+ if (pdata && pdata->pressure)
+ wm831x_ts->pressure = true;
@@ -355,22 +353,24 @@ index 0000000..a424a80
+ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
+ WM831X_TCH_PDONLY, 0);
+
-+ /* Default to 192 samples/sec */
-+ wm831x_ts->rate = 12;
++ /* Default to 96 samples/sec */
++ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
++ WM831X_TCH_RATE_MASK, 6);
+
+ ret = request_threaded_irq(wm831x_ts->data_irq, NULL,
+ wm831x_ts_data_irq,
-+ IRQF_ONESHOT, /* Trigger */
++ IRQF_ONESHOT,
+ "Touchscreen data", wm831x_ts);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "Failed to request data IRQ %d: %d\n",
+ wm831x_ts->data_irq, ret);
+ goto err_alloc;
+ }
++ disable_irq(wm831x_ts->data_irq);
+
+ ret = request_threaded_irq(wm831x_ts->pd_irq, NULL,
+ wm831x_ts_pen_down_irq,
-+ IRQF_ONESHOT, /* Trigger */
++ IRQF_SAMPLE_RANDOM | IRQF_ONESHOT,
+ "Touchscreen pen down", wm831x_ts);
+
+ if (ret < 0) {
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch
new file mode 100644
index 0000000..fc5c6a8
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/413-wolfson-mfd-wm831x-Support_configuration_of_IRQ_output_in_CMOS_mode.patch
@@ -0,0 +1,51 @@
+>From 25d95db8096f73f3c7d277f44c8daf7642142e2f Mon Sep 17 00:00:00 2001
+From: Mark Brown <br...@op...>
+Date: Thu, 6 Jan 2011 13:08:25 +0000
+Subject: [PATCH] mfd: Support configuration of WM831x /IRQ output in CMOS mode
+
+Provide platform data allowing the system to set the /IRQ pin into
+CMOS mode rather than the default open drain. The default value of
+this platform data reflects the default hardware configuration so
+there should be no change to existing users.
+
+Signed-off-by: Mark Brown <br...@op...>
+---
+ drivers/mfd/wm831x-irq.c | 7 +++++++
+ include/linux/mfd/wm831x/pdata.h | 3 +++
+ 2 files changed, 10 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mfd/wm831x-irq.c b/drivers/mfd/wm831x-irq.c
+index f7192d4..0d3cda4 100644
+--- a/drivers/mfd/wm831x-irq.c
++++ b/drivers/mfd/wm831x-irq.c
+@@ -515,6 +515,13 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq)
+ return 0;
+ }
+
++ if (pdata->irq_cmos)
++ i = 0;
++ else
++ i = WM831X_IRQ_OD;
++ wm831x_set_bits(wm831x, WM831X_IRQ_CONFIG,
++ WM831X_IRQ_OD, i);
++
+ wm831x->irq = irq;
+ wm831x->irq_base = pdata->irq_base;
+
+diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h
+index fd322ac..1ae8499 100644
+--- a/include/linux/mfd/wm831x/pdata.h
++++ b/include/linux/mfd/wm831x/pdata.h
+@@ -109,6 +109,9 @@ struct wm831x_pdata {
+ /** Called after subdevices are set up */
+ int (*post_init)(struct wm831x *wm831x);
+
++ /** Put the /IRQ line into CMOS mode */
++ bool irq_cmos;
++
+ int irq_base;
+ int gpio_base;
+ struct wm831x_backlight_pdata *backlight;
+--
+1.7.2.3
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/416-armadeus-input-wm831x-makes_touch_driver_work.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/416-armadeus-input-wm831x-makes_touch_driver_work.patch
deleted file mode 100644
index f1ae70a..0000000
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/416-armadeus-input-wm831x-makes_touch_driver_work.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Index: linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c
-===================================================================
---- linux-2.6.38-alpha.orig/drivers/input/touchscreen/wm831x-ts.c 2011-01-20 20:29:00.000000000 +0100
-+++ linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c 2011-01-20 20:29:10.000000000 +0100
-@@ -101,6 +101,7 @@
- int pd_irq;
- int rate;
- bool pressure;
-+ int pd_detected;
- };
-
- static irqreturn_t wm831x_ts_data_irq(int irq, void *irq_data)
-@@ -140,7 +141,7 @@
- data[i] & WM831X_TCH_DATA_MASK);
- }
-
-- if (!pen_down) {
-+ if ((!pen_down) && (wm831x_ts->pd_detected)) {
- /* Don't need data any more */
- wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
- WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA |
-@@ -148,13 +149,14 @@
-
- /* Drop the conversion rate while pen is up */
- wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-- WM831X_TCH_RATE_MASK, 0);
-+ WM831X_TCH_RATE_MASK, 1);
-
- if (wm831x_ts->pressure)
- input_report_abs(wm831x_ts->input_dev,
- ABS_PRESSURE, 0);
-
- input_report_key(wm831x_ts->input_dev, BTN_TOUCH, 0);
-+ wm831x_ts->pd_detected = 0;
- }
-
- input_sync(wm831x_ts->input_dev);
-@@ -166,7 +168,7 @@
- {
- struct wm831x_ts *wm831x_ts = irq_data;
- struct wm831x *wm831x = wm831x_ts->wm831x;
-- int ena;
-+ int ena = 0;
-
- /* Raise conversion rate to normal rate */
- wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-@@ -175,8 +177,6 @@
- /* Start collecting data */
- if (wm831x_ts->pressure)
- ena |= WM831X_TCH_Z_ENA;
-- else
-- ena = 0;
-
- wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
- WM831X_TCH_X_ENA | WM831X_TCH_Y_ENA | WM831X_TCH_Z_ENA,
-@@ -185,6 +185,7 @@
- input_report_key(wm831x_ts->input_dev, BTN_TOUCH, 1);
- input_sync(wm831x_ts->input_dev);
-
-+ wm831x_ts->pd_detected = 1;
- wm831x_set_bits(wm831x, WM831X_INTERRUPT_STATUS_1,
- WM831X_TCHPD_EINT, WM831X_TCHPD_EINT);
-
-@@ -248,7 +249,7 @@
- if (pdata && pdata->pd_irq)
- wm831x_ts->pd_irq = pdata->pd_irq;
- else
-- wm831x_ts->data_irq = platform_get_irq_byname(pdev,
-+ wm831x_ts->pd_irq = platform_get_irq_byname(pdev,
- "TCHPD");
-
- if (pdata && pdata->pressure)
-@@ -290,8 +291,10 @@
- wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
- WM831X_TCH_PDONLY, 0);
-
-- /* Default to 192 samples/sec */
-+ /* Default to 192 samples/sec when active and 16/sec when inactive */
- wm831x_ts->rate = 12;
-+ wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_1,
-+ WM831X_TCH_RATE_MASK, 1);
-
- ret = request_threaded_irq(wm831x_ts->data_irq, NULL,
- wm831x_ts_data_irq,
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch
index cb07d96..0301ead 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/417-armadeus-input-wm831x-driver_hacks.patch
@@ -2,9 +2,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c
===================================================================
---- linux-2.6.38-alpha.orig/drivers/input/touchscreen/wm831x-ts.c 2011-01-20 20:29:10.000000000 +0100
-+++ linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c 2011-01-20 20:29:22.000000000 +0100
-@@ -226,6 +226,7 @@
+--- linux-2.6.38-alpha.orig/drivers/input/touchscreen/wm831x-ts.c 2011-01-21 09:27:14.000000000 +0100
++++ linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c 2011-01-21 09:27:14.000000000 +0100
+@@ -225,6 +225,7 @@
struct input_dev *input_dev;
int ret;
@@ -12,7 +12,7 @@ Index: linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c
wm831x_ts = kzalloc(sizeof(struct wm831x_ts), GFP_KERNEL);
if (!wm831x_ts)
return -ENOMEM;
-@@ -262,7 +263,7 @@
+@@ -259,7 +260,7 @@
wm831x_set_bits(wm831x, WM831X_TOUCH_CONTROL_2,
WM831X_TCH_5WIRE, WM831X_TCH_5WIRE);
@@ -21,7 +21,7 @@ Index: linux-2.6.38-alpha/drivers/input/touchscreen/wm831x-ts.c
WARN_ON(pdata->pressure && pdata->fivewire);
wm831x_ts->pressure = false;
} else {
-@@ -319,6 +320,17 @@
+@@ -316,6 +317,17 @@
platform_set_drvdata(pdev, wm831x_ts);
hooks/post-receive
--
armadeus
|