armadeus-commitlog Mailing List for armadeus (Page 121)
Brought to you by:
sszy
Menu
▾
▴
armadeus-commitlog — Armadeus GIT commit logs
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(43) |
Feb
(8) |
Mar
(7) |
Apr
(8) |
May
(14) |
Jun
(6) |
Jul
(4) |
Aug
(17) |
Sep
(18) |
Oct
(19) |
Nov
(52) |
Dec
(30) |
| 2008 |
Jan
(6) |
Feb
(6) |
Mar
(15) |
Apr
(22) |
May
(13) |
Jun
(11) |
Jul
(41) |
Aug
(10) |
Sep
(14) |
Oct
(21) |
Nov
(4) |
Dec
(66) |
| 2009 |
Jan
(67) |
Feb
(57) |
Mar
(90) |
Apr
(54) |
May
(64) |
Jun
(76) |
Jul
(14) |
Aug
(18) |
Sep
(18) |
Oct
(20) |
Nov
(15) |
Dec
(36) |
| 2010 |
Jan
(28) |
Feb
(25) |
Mar
(32) |
Apr
(23) |
May
(22) |
Jun
(62) |
Jul
(36) |
Aug
(16) |
Sep
(12) |
Oct
(20) |
Nov
(44) |
Dec
(25) |
| 2011 |
Jan
(36) |
Feb
(49) |
Mar
(28) |
Apr
(38) |
May
(26) |
Jun
(52) |
Jul
(33) |
Aug
(32) |
Sep
(19) |
Oct
(26) |
Nov
(13) |
Dec
(32) |
| 2012 |
Jan
(38) |
Feb
(34) |
Mar
(91) |
Apr
(35) |
May
(31) |
Jun
(72) |
Jul
(23) |
Aug
(13) |
Sep
(33) |
Oct
(47) |
Nov
(18) |
Dec
(22) |
| 2013 |
Jan
(31) |
Feb
(22) |
Mar
(26) |
Apr
(11) |
May
(38) |
Jun
(15) |
Jul
(37) |
Aug
(68) |
Sep
(34) |
Oct
(11) |
Nov
(26) |
Dec
(31) |
| 2014 |
Jan
(60) |
Feb
(55) |
Mar
(21) |
Apr
(31) |
May
(17) |
Jun
(35) |
Jul
(24) |
Aug
(17) |
Sep
(11) |
Oct
(23) |
Nov
(10) |
Dec
(23) |
| 2015 |
Jan
(15) |
Feb
(34) |
Mar
(46) |
Apr
(23) |
May
(12) |
Jun
(14) |
Jul
(18) |
Aug
(22) |
Sep
(6) |
Oct
(2) |
Nov
(1) |
Dec
(6) |
| 2016 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
(10) |
May
(17) |
Jun
(6) |
Jul
(4) |
Aug
(6) |
Sep
(22) |
Oct
(8) |
Nov
(9) |
Dec
(5) |
| 2017 |
Jan
(11) |
Feb
(12) |
Mar
(27) |
Apr
(9) |
May
(1) |
Jun
(5) |
Jul
(11) |
Aug
(10) |
Sep
(6) |
Oct
(10) |
Nov
(4) |
Dec
(6) |
| 2018 |
Jan
(6) |
Feb
(13) |
Mar
(9) |
Apr
(7) |
May
(10) |
Jun
(9) |
Jul
(21) |
Aug
(13) |
Sep
(10) |
Oct
(4) |
Nov
(6) |
Dec
(1) |
| 2019 |
Jan
(6) |
Feb
(2) |
Mar
(5) |
Apr
(6) |
May
(19) |
Jun
(14) |
Jul
(18) |
Aug
(3) |
Sep
(5) |
Oct
(7) |
Nov
(8) |
Dec
(4) |
| 2020 |
Jan
(10) |
Feb
(3) |
Mar
(9) |
Apr
(7) |
May
(2) |
Jun
(18) |
Jul
(3) |
Aug
|
Sep
|
Oct
(7) |
Nov
|
Dec
(1) |
| 2021 |
Jan
(9) |
Feb
(6) |
Mar
(4) |
Apr
(11) |
May
(7) |
Jun
(5) |
Jul
(2) |
Aug
(4) |
Sep
(10) |
Oct
(9) |
Nov
(5) |
Dec
|
| 2022 |
Jan
(2) |
Feb
(12) |
Mar
(3) |
Apr
(5) |
May
(1) |
Jun
(3) |
Jul
(2) |
Aug
(1) |
Sep
(4) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2023 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
(2) |
May
(1) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(4) |
| 2024 |
Jan
(2) |
Feb
(3) |
Mar
(8) |
Apr
(4) |
May
(1) |
Jun
(13) |
Jul
(7) |
Aug
(1) |
Sep
(6) |
Oct
(5) |
Nov
(11) |
Dec
(7) |
| 2025 |
Jan
(3) |
Feb
(1) |
Mar
(6) |
Apr
(4) |
May
(4) |
Jun
(1) |
Jul
(1) |
Aug
(7) |
Sep
(4) |
Oct
(4) |
Nov
(4) |
Dec
(1) |
| 2026 |
Jan
(3) |
Feb
(7) |
Mar
(3) |
Apr
(1) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ar...@us...> - 2009-06-05 20:16:30
|
Revision: 1331
http://armadeus.svn.sourceforge.net/armadeus/?rev=1331&view=rev
Author: artemys
Date: 2009-06-05 20:14:27 +0000 (Fri, 05 Jun 2009)
Log Message:
-----------
[TEST] Cleanup testbutton tool and makes it available for test config
Modified Paths:
--------------
trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk
trunk/target/linux/modules/fpga/wishbone_example/wb_button/Makefile
trunk/target/linux/modules/fpga/wishbone_example/wb_button/testbutton.c
Modified: trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk
===================================================================
--- trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk 2009-06-04 16:12:59 UTC (rev 1330)
+++ trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk 2009-06-05 20:14:27 UTC (rev 1331)
@@ -11,6 +11,7 @@
ARMADEUS-TESTSUITE_BINARY:=test_env.sh
ARMADEUS-TESTSUITE_TARGET_DIR:=$(TARGET_DIR)/usr/bin/testsuite
ARMADEUS-TESTSUITE_TARGET_BINARY:=$(ARMADEUS-TESTSUITE_TARGET_DIR)/$(ARMADEUS-TESTSUITE_BINARY)
+ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR:=$(BUILD_DIR)/../../target/linux/modules/fpga/wishbone_example/wb_button/
$(ARMADEUS-TESTSUITE_DIR)/.unpacked:
mkdir -p $(ARMADEUS-TESTSUITE_DIR)/
@@ -21,6 +22,8 @@
mkdir -p $(ARMADEUS-TESTSUITE_TARGET_DIR)
find $(ARMADEUS-TESTSUITE_DIR) -name "*.sh" -exec install -D {} $(ARMADEUS-TESTSUITE_TARGET_DIR) \;
cp -r $(ARMADEUS-TESTSUITE_DIR)/data $(ARMADEUS-TESTSUITE_TARGET_DIR)/
+ make -C $(ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR) test
+ install -D $(ARMADEUS-TESTSUITE_WISHBONE_BUTTON_DIR)/testbutton $(ARMADEUS-TESTSUITE_TARGET_DIR)
touch $@
armadeus-testsuite: $(ARMADEUS-TESTSUITE_TARGET_BINARY)
Modified: trunk/target/linux/modules/fpga/wishbone_example/wb_button/Makefile
===================================================================
--- trunk/target/linux/modules/fpga/wishbone_example/wb_button/Makefile 2009-06-04 16:12:59 UTC (rev 1330)
+++ trunk/target/linux/modules/fpga/wishbone_example/wb_button/Makefile 2009-06-05 20:14:27 UTC (rev 1331)
@@ -19,8 +19,7 @@
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
test:
- ~/armadeus/buildroot/build_arm/staging_dir/bin/arm-linux-gcc testbutton.c -o testbutton
- chmod 755 testbutton
+ $(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc testbutton.c -o testbutton
clean:
rm -f *.*o \
Modified: trunk/target/linux/modules/fpga/wishbone_example/wb_button/testbutton.c
===================================================================
--- trunk/target/linux/modules/fpga/wishbone_example/wb_button/testbutton.c 2009-06-04 16:12:59 UTC (rev 1330)
+++ trunk/target/linux/modules/fpga/wishbone_example/wb_button/testbutton.c 2009-06-05 20:14:27 UTC (rev 1331)
@@ -1,14 +1,9 @@
-/* a program to test button driver
- * Fabien Marteau <fab...@ar...>
- * 7 april 2008
- * fpgaaccess.h
+/*
+ * A simple program to test Wishbone button driver
*
* (c) Copyright 2008 Armadeus project
* Fabien Marteau <fab...@ar...>
*
- * A simple driver for reading and writing on
- * fpga throught a character file /dev/fpgaaccess
- *
* 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, or (at your option)
@@ -40,45 +35,48 @@
int fbutton;
-void quit(int pouet){
+void quit(int pouet) {
close(fbutton);
exit(0);
}
+void usage(char *exe) {
+ if (exe) {
+ printf("\nUsage:\n");
+ printf("%s <button_device>\n", exe);
+ }
+}
+
int main(int argc, char *argv[])
{
- unsigned short i,j;
+ unsigned short i, j=0;
/* quit when Ctrl-C pressed */
signal(SIGINT, quit);
- j=0;
-
printf( "Testing button driver\n" );
- if(argc < 2){
- perror("invalide arguments number\ntestbutton <button_filename>\n");
+ if (argc < 2) {
+ printf("invalid arguments number\n");
+ usage(argv[0]);
exit(EXIT_FAILURE);
}
- fbutton=open(argv[1],O_RDWR);
- if(fbutton<0){
- perror("can't open file\n");
+ fbutton = open(argv[1], O_RDWR);
+ if (fbutton < 0) {
+ perror("can't open file");
exit(EXIT_FAILURE);
}
- while(1){
- i = (i==0)?1:0;
- fflush(stdout);
-
+ while (1) {
/* read value */
- if(read(fbutton,&j,1)<0){
- perror("read error\n");
+ if (read(fbutton, &j, 1) < 0) {
+ perror("read error");
exit(EXIT_FAILURE);
}
printf("Read %d\n",j);
- if(lseek(fbutton,0,SEEK_SET)<0){
+ if (lseek(fbutton, 0, SEEK_SET) < 0) {
perror("lseek error\n");
exit(EXIT_FAILURE);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2009-06-04 16:13:00
|
Revision: 1330
http://armadeus.svn.sourceforge.net/armadeus/?rev=1330&view=rev
Author: FabM
Date: 2009-06-04 16:12:59 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[DEBUG] pedantic commit
Modified Paths:
--------------
trunk/buildroot/package/fpgaregs/fpgaregs.mk
trunk/target/linux/debug/fpgaregs/fpgaregs.c
Modified: trunk/buildroot/package/fpgaregs/fpgaregs.mk
===================================================================
--- trunk/buildroot/package/fpgaregs/fpgaregs.mk 2009-06-04 13:17:03 UTC (rev 1329)
+++ trunk/buildroot/package/fpgaregs/fpgaregs.mk 2009-06-04 16:12:59 UTC (rev 1330)
@@ -1,14 +1,13 @@
#############################################################
#
# fpgaregs debug tool
-#\n\n
+#
#############################################################
FPGAREGS_VER:=1.0
FPGAREGS_SOURCE:=$(BUILD_DIR)/../../target/linux/debug/fpgaregs/
FPGAREGS_DIR:=$(BUILD_DIR)/fpgaregs-$(FPGAREGS_VER)
FPGAREGS_CAT:=zcat
-FPGAREGS_BINARY:=fpgaregs
ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
FPGAREGS_BINARY:=fpga27regs
else
Modified: trunk/target/linux/debug/fpgaregs/fpgaregs.c
===================================================================
--- trunk/target/linux/debug/fpgaregs/fpgaregs.c 2009-06-04 13:17:03 UTC (rev 1329)
+++ trunk/target/linux/debug/fpgaregs/fpgaregs.c 2009-06-04 16:12:59 UTC (rev 1330)
@@ -72,7 +72,7 @@
printf("fpgaregs for platform %s\n",PLATFORM);
printf("Usage:\n");
printf("fpgaregs [w,l] fpga_reg_add [value].\n");
- printf(" w: word access\n");
+ printf(" w: word access\n");
printf(" l: long access\n");
printf("\n Ex: fpgaregs w 0x10 0x1234, fpgaregs l 0x10 0x12345678\n");
return -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2009-06-04 13:17:04
|
Revision: 1329
http://armadeus.svn.sourceforge.net/armadeus/?rev=1329&view=rev
Author: FabM
Date: 2009-06-04 13:17:03 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[SOFTWARE] change serial timing for uboot_recover for apf27
Modified Paths:
--------------
trunk/software/uboot_recover/apf27_recover.py
Modified: trunk/software/uboot_recover/apf27_recover.py
===================================================================
--- trunk/software/uboot_recover/apf27_recover.py 2009-06-04 12:08:35 UTC (rev 1328)
+++ trunk/software/uboot_recover/apf27_recover.py 2009-06-04 13:17:03 UTC (rev 1329)
@@ -31,6 +31,37 @@
import thread
import re
+class Error(Exception):
+ """ Manage specific error
+
+ attributes:
+ message -- the message
+ level -- the exception level
+ """
+
+ def __init__(self,message,level=0):
+ self._message = message
+ self.level = level
+ Exception.__init__(self,message)
+
+ def __repr__(self):
+ return self.message
+
+ def _get_message(self):
+ return self._message
+ def _set_message(self, message):
+ self._message = message
+ message = property(_get_message, _set_message)
+
+
+ def __str__(self):
+ print self.message
+
+ def setLevel(self,level):
+ self.level = int(str(level))
+ def getLevel(self):
+ return self.level
+
class apf27Bootloader:
statuscode = { 0x8D: 'data specified is out of bounds',
@@ -74,10 +105,13 @@
#print 'get Status'
self.port.write( self.buildcmd("0505" ,"00000000","b","00000000","00","0" ))
result = self.port.read(4)
- if len(result) > 0:
- print self.statuscode[ord(result[0])]
- #for i in range(len(result)):
- # print '%02x' % ord(result[i]),
+ if len(result) > 0:
+ try:
+ print self.statuscode[ord(result[0])]
+ #for i in range(len(result)):
+ # print '%02x' % ord(result[i]),
+ except KeyError,e:
+ print "Unknown status "+str(ord(result[0]))
else:
print '\nread timeout'
@@ -325,7 +359,7 @@
print "and be sure to have a u-boot.bin file in current dir"
port = raw_input('Enter serial port number or name to use (/dev/ttySx under Linux and COMx under Windows: ')
try:
- ser = serial.Serial(port, SPEED, timeout=1)
+ ser = serial.Serial(port, SPEED, timeout=3)
except Exception, msg:
print "unable to open serial port %s" % port
print msg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Fa...@us...> - 2009-06-04 12:09:51
|
Revision: 1328
http://armadeus.svn.sourceforge.net/armadeus/?rev=1328&view=rev
Author: FabM
Date: 2009-06-04 12:08:35 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[DEBUG] fpgaregs for apf27 bug corrected, help/error message improved
Modified Paths:
--------------
trunk/buildroot/package/fpgaregs/fpgaregs.mk
trunk/target/linux/debug/fpgaregs/fpga27regs.h
trunk/target/linux/debug/fpgaregs/fpgaregs.c
trunk/target/linux/debug/fpgaregs/fpgaregs.h
Modified: trunk/buildroot/package/fpgaregs/fpgaregs.mk
===================================================================
--- trunk/buildroot/package/fpgaregs/fpgaregs.mk 2009-06-04 09:51:39 UTC (rev 1327)
+++ trunk/buildroot/package/fpgaregs/fpgaregs.mk 2009-06-04 12:08:35 UTC (rev 1328)
@@ -1,7 +1,7 @@
#############################################################
#
# fpgaregs debug tool
-#
+#\n\n
#############################################################
FPGAREGS_VER:=1.0
@@ -10,9 +10,9 @@
FPGAREGS_CAT:=zcat
FPGAREGS_BINARY:=fpgaregs
ifeq ($(BR2_TARGET_ARMADEUS_APF27),y)
-IMXREGS_BINARY:=fpga27regs
+FPGAREGS_BINARY:=fpga27regs
else
-IMXREGS_BINARY:=fpgaregs
+FPGAREGS_BINARY:=fpgaregs
endif
FPGAREGS_TARGET_BINARY:=usr/bin/fpgaregs
Modified: trunk/target/linux/debug/fpgaregs/fpga27regs.h
===================================================================
--- trunk/target/linux/debug/fpgaregs/fpga27regs.h 2009-06-04 09:51:39 UTC (rev 1327)
+++ trunk/target/linux/debug/fpgaregs/fpga27regs.h 2009-06-04 12:08:35 UTC (rev 1328)
@@ -18,4 +18,5 @@
*
*/
+#define PLATFORM "APF27"
#define FPGA_ADDRESS 0xD6000000
Modified: trunk/target/linux/debug/fpgaregs/fpgaregs.c
===================================================================
--- trunk/target/linux/debug/fpgaregs/fpgaregs.c 2009-06-04 09:51:39 UTC (rev 1327)
+++ trunk/target/linux/debug/fpgaregs/fpgaregs.c 2009-06-04 12:08:35 UTC (rev 1328)
@@ -68,8 +68,13 @@
void* ptr_fpga;
if ((argc < 3) || (argc > 4)) {
- printf("invalid arguments number\nfpgaregs [w,l] fpga_reg_add [value].\n\tw: word access, l: long access\n\
- \tEx: fpgaregs w 0x10 0x1234, fpgaregs l 0x10 0x12345678\n");
+ printf("invalid arguments number\n");
+ printf("fpgaregs for platform %s\n",PLATFORM);
+ printf("Usage:\n");
+ printf("fpgaregs [w,l] fpga_reg_add [value].\n");
+ printf(" w: word access\n");
+ printf(" l: long access\n");
+ printf("\n Ex: fpgaregs w 0x10 0x1234, fpgaregs l 0x10 0x12345678\n");
return -1;
}
Modified: trunk/target/linux/debug/fpgaregs/fpgaregs.h
===================================================================
--- trunk/target/linux/debug/fpgaregs/fpgaregs.h 2009-06-04 09:51:39 UTC (rev 1327)
+++ trunk/target/linux/debug/fpgaregs/fpgaregs.h 2009-06-04 12:08:35 UTC (rev 1328)
@@ -18,5 +18,6 @@
*
*/
+#define PLATFORM "APF9328"
#define FPGA_ADDRESS 0x12000000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-04 09:51:41
|
Revision: 1327
http://armadeus.svn.sourceforge.net/armadeus/?rev=1327&view=rev
Author: artemys
Date: 2009-06-04 09:51:39 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[LINUX] Updates some 2.6.29 patches to prevent warnings when applying them (2nd pass)
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/096-armadeus-clock-add_ssi_clk.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/296-apf27-armadeus-imx27-usb-host1.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/320-apf27-armadeus-increase_max_dma_zone_size.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/321-apf27-armadeus-mx2_adds_pwm_ressources.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/072-armadeus-add_backlight_machinfo_to_imxfb_h.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -1,8 +1,8 @@
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
+Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/imxfb.h
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-03-30 11:09:44.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-03-30 11:13:05.000000000 +0200
-@@ -82,3 +82,13 @@
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-06-04 11:30:48.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/imxfb.h 2009-06-04 11:30:49.000000000 +0200
+@@ -84,3 +84,13 @@
};
void set_imx_fb_info(struct imx_fb_platform_data *);
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/096-armadeus-clock-add_ssi_clk.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/096-armadeus-clock-add_ssi_clk.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/096-armadeus-clock-add_ssi_clk.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -1,5 +1,7 @@
---- linux-2.6.27.2.original/arch/arm/mach-imx/clock.c 2009-01-14 10:20:49.000000000 +0100
-+++ linux-2.6.27.2/arch/arm/mach-imx/clock.c 2009-01-14 09:55:02.000000000 +0100
+Index: linux-2.6.29.4/arch/arm/mach-imx/clock.c
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/clock.c 2009-06-04 11:30:48.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/clock.c 2009-06-04 11:38:52.000000000 +0200
@@ -151,6 +151,11 @@
.get_rate = imx_get_perclk3,
};
@@ -10,7 +12,7 @@
+};
+
static struct clk clk_usb_clk = {
- .name = "usb_clk",
+ .name = "usbd_clk",
.get_rate = imx_get_usb_clk,
@@ -165,6 +170,7 @@
&clk_mcu_clk,
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/296-apf27-armadeus-imx27-usb-host1.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/296-apf27-armadeus-imx27-usb-host1.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/296-apf27-armadeus-imx27-usb-host1.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -1,8 +1,8 @@
-Index: linux-2.6.29/arch/arm/mach-mx2/devices.c
+Index: linux-2.6.29.4/arch/arm/mach-mx2/devices.c
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-mx2/devices.c 2009-03-31 11:26:28.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-mx2/devices.c 2009-03-31 11:26:30.000000000 +0200
-@@ -605,6 +605,30 @@
+--- linux-2.6.29.4.orig/arch/arm/mach-mx2/devices.c 2009-06-04 11:30:50.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/devices.c 2009-06-04 11:30:50.000000000 +0200
+@@ -609,6 +609,30 @@
.num_resources = ARRAY_SIZE(mxc_otg_resources),
};
@@ -33,7 +33,7 @@
static struct resource mxc_ehci2_resources[] = {
{
.start = OTG_BASE_ADDR + 0x400,
-@@ -620,7 +644,7 @@
+@@ -624,7 +648,7 @@
struct platform_device mxc_ehci2 = {
.name = "mxc-ehci",
@@ -42,10 +42,10 @@
.dev = {
.coherent_dma_mask = 0xffffffff,
.dma_mask = &ehci2_dmamask,
-Index: linux-2.6.29/arch/arm/mach-mx2/devices.h
+Index: linux-2.6.29.4/arch/arm/mach-mx2/devices.h
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-mx2/devices.h 2009-03-31 10:36:30.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-mx2/devices.h 2009-03-31 11:26:30.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/mach-mx2/devices.h 2009-06-04 11:30:50.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/devices.h 2009-06-04 11:30:50.000000000 +0200
@@ -28,4 +28,5 @@
extern struct platform_device imx_ssi_device1;
extern struct platform_device mxc_dam_device;
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/297-apf27-armadeus-add_backlight_machinfo_to_plat_mxc_imxfb_h.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -1,6 +1,8 @@
---- linux-2.6.27.2.original/arch/arm/plat-mxc/include/mach/imxfb.h 2008-12-19 16:20:18.000000000 +0100
-+++ linux-2.6.27.2.mod/arch/arm/plat-mxc/include/mach/imxfb.h 2008-12-19 16:18:44.000000000 +0100
-@@ -83,3 +83,13 @@
+Index: linux-2.6.29.4/arch/arm/plat-mxc/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-06-04 11:30:50.000000000 +0200
++++ linux-2.6.29.4/arch/arm/plat-mxc/include/mach/imxfb.h 2009-06-04 11:30:50.000000000 +0200
+@@ -81,3 +81,13 @@
};
void set_imx_fb_info(struct imx_fb_platform_data *);
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/314-apf27-armadeus-ad9889.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -1,5 +1,7 @@
---- linux-2.6.27.13.orig/drivers/media/video/ad9889.c 2008-10-10 00:13:53.000000000 +0200
-+++ linux-2.6.27.13/drivers/media/video/ad9889.c 2009-03-01 08:29:01.000000000 +0100
+Index: linux-2.6.29.4/drivers/media/video/ad9889.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.4/drivers/media/video/ad9889.c 2009-06-04 11:36:41.000000000 +0200
@@ -0,0 +1,509 @@
+/*
+ * ad9889 - Analog Devices AD9889 video encoder driver
@@ -99,7 +101,7 @@
+}
+
+static void ad9889_av_mute_on(struct i2c_client *client)
-+{
++{
+ /* set chxPwrDwnI2C */
+ ad9889_write(client, 0xa1, 0x38);
+ /* set avmute*/
@@ -114,7 +116,6 @@
+ ad9889_write(client, 0x45, 0x80);
+}
+
-+
+static void ad9889_init(struct i2c_client *client)
+{
+ ad9889_av_mute_on(client);
@@ -142,14 +143,15 @@
+
+static void setup_audio_video(struct i2c_client *client)
+{
-+ unsigned char rgb_rgb[24] = {0x07, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0x07,
-+ 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0x07, 0xff, 0, 0};
++ unsigned char rgb_rgb[24] = { 0x07, 0xff, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0x07, 0xff, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0x07, 0xff, 0, 0 };
+ /* dvi */
+ ad9889_write(client, 0xaf, 0x04);
+ /* write color map */
+ i2c_smbus_write_block_data(client, 0x17,24,rgb_rgb);
+ /* set CSC mode */
-+ ad9889_write(client, 0x17, 0x08);
++ ad9889_write(client, 0x17, 0x08);
+ /* disable CSC */
+ ad9889_write(client, 0x3b, 0x01);
+ /* check input mode */
@@ -164,7 +166,7 @@
+{
+ union i2c_smbus_data data;
+ struct ad9889_config* config = client->dev.platform_data;
-+ struct ad9889_dev *ad9889 = i2c_get_clientdata(client);
++ struct ad9889_dev *ad9889 = i2c_get_clientdata(client);
+ int status, i;
+
+ /* EDID ram base address */
@@ -186,7 +188,7 @@
+int handle_edid_interrupt(struct i2c_client *client)
+{
+ unsigned char edid_dat[256];
-+
++
+ if( EDID_ram_read_data(client, edid_dat) < 0 )
+ printk(KERN_ERR "error when reading EDID\n");
+ else{
@@ -211,9 +213,10 @@
+static void handle_hpd_interrupt(struct i2c_client *client)
+{
+ struct ad9889_config *pdata = client->dev.platform_data;
-+ if(ad9889_read(client, 0x42)&0x40) {
++
++ if (ad9889_read(client, 0x42)&0x40) {
+ /* wait until the cable is really inserted */
-+ mdelay(500);
++ mdelay(500);
+ /* set chxPwrDwnI2C down */
+ ad9889_write(client, 0xa1, 0x38);
+ /* power up chip */
@@ -222,9 +225,8 @@
+ ad9889_write(client, 0x95, 0xC3);
+ if(pdata->display_connected)
+ pdata->display_connected();
-+ }
-+ else{
-+ if(pdata->display_disconnected)
++ } else {
++ if (pdata->display_disconnected)
+ pdata->display_disconnected();
+ }
+}
@@ -291,7 +293,7 @@
+ /*Check if additional interrupts occured during processing*/
+ interrupt_remain1 = ad9889_read(client, 0x96);
+ interrupt_remain2 = ad9889_read(client, 0x97);
-+ }
++ }
+ mutex_unlock(&ad9889->lock_sync);
+}
+
@@ -332,7 +334,7 @@
+
+ return len;
+}
-+
++
+static int ad9889_proc_write_register( __attribute__ ((unused)) struct file *file, const char *buf, unsigned long count, void *data)
+{
+ int len, ret;
@@ -426,15 +428,15 @@
+ goto err_irq;
+ }
+
-+ /* check whether the AD9889 is present */
-+ if( ad9889_read(client, 0xA5) != 0x04 ){
++ /* check whether the AD9889 is present */
++ if (ad9889_read(client, 0xA5) != 0x04) {
+ printk("ad9889 not found\n");
+ err = -ENODEV;
+ goto err_presence;
-+ }
++ }
+
+ ad9889->edid_ram = i2c_new_dummy(client->adapter, pdata->EDID_I2C_addr);
-+ if( !ad9889->edid_ram ){
++ if (!ad9889->edid_ram) {
+ printk("error: can't add i2c device at 0x%x\n", pdata->EDID_I2C_addr);
+ goto err_presence;
+ }
@@ -443,12 +445,12 @@
+ /* reset */
+ ad9889_write(client, 0x41, 0X60);
+ mdelay(10);
-+
++
+ mutex_unlock(&ad9889->lock_sync);
-+
++
+ /* if a monitor is already connected, then simulate interrupt */
+ err = ad9889_read(client, 0x42);
-+ if( err & 0x40){
++ if (err & 0x40) {
+ /* power up */
+ ad9889->force_hpd = 1;
+ schedule_work(&ad9889->work);
@@ -505,13 +507,15 @@
+
+static struct v4l2_i2c_driver_data v4l2_i2c_data = {
+ .name = "ad9889",
-+ //.command = ad9889_command,
++ /*.command = ad9889_command,*/
+ .probe = ad9889_probe,
+ .remove = ad9889_remove,
+ .id_table = ad9889_id,
+};
---- linux-2.6.27.13.orig/include/media/ad9889.h 2008-10-10 00:13:53.000000000 +0200
-+++ linux-2.6.27.13/include/media/ad9889.h 2009-03-01 08:29:01.000000000 +0100
+Index: linux-2.6.29.4/include/media/ad9889.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.4/include/media/ad9889.h 2009-06-04 11:30:50.000000000 +0200
@@ -0,0 +1,34 @@
+/*
+ * AD9889 driver
@@ -547,9 +551,11 @@
+
+
+#endif /* __LINUX_VIDE0_AD9889_H */
---- linux-2.6.27.13.orig/drivers/media/video/Makefile 2009-03-08 15:26:08.000000000 +0100
-+++ linux-2.6.27.13/drivers/media/video/Makefile 2009-03-07 19:02:17.000000000 +0100
-@@ -46,6 +46,7 @@ obj-$(CONFIG_VIDEO_SAA717X) += saa717x.o
+Index: linux-2.6.29.4/drivers/media/video/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/drivers/media/video/Makefile 2009-06-04 11:30:49.000000000 +0200
++++ linux-2.6.29.4/drivers/media/video/Makefile 2009-06-04 11:30:50.000000000 +0200
+@@ -50,6 +50,7 @@
obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
obj-$(CONFIG_VIDEO_SAA7185) += saa7185.o
obj-$(CONFIG_VIDEO_SAA7191) += saa7191.o
@@ -557,9 +563,11 @@
obj-$(CONFIG_VIDEO_ADV7170) += adv7170.o
obj-$(CONFIG_VIDEO_ADV7175) += adv7175.o
obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o
---- linux-2.6.27.13.orig/drivers/media/video/Kconfig 2009-03-08 15:26:08.000000000 +0100
-+++ linux-2.6.27.13.orig/drivers/media/video/Kconfig 2009-03-07 19:02:02.000000000 +0100
-@@ -407,6 +407,16 @@ config VIDEO_SAA7185
+Index: linux-2.6.29.4/drivers/media/video/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/media/video/Kconfig 2009-06-04 11:30:49.000000000 +0200
++++ linux-2.6.29.4/drivers/media/video/Kconfig 2009-06-04 11:30:50.000000000 +0200
+@@ -428,6 +428,16 @@
To compile this driver as a module, choose M here: the
module will be called saa7185.
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/320-apf27-armadeus-increase_max_dma_zone_size.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/320-apf27-armadeus-increase_max_dma_zone_size.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/320-apf27-armadeus-increase_max_dma_zone_size.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -3,13 +3,13 @@
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.27.13/arch/arm/plat-mxc/include/mach/memory.h
+Index: linux-2.6.29.4/arch/arm/plat-mxc/include/mach/memory.h
===================================================================
---- linux-2.6.27.13.orig/arch/arm/plat-mxc/include/mach/memory.h 2009-03-27 17:52:54.000000000 +0100
-+++ linux-2.6.27.13/arch/arm/plat-mxc/include/mach/memory.h 2009-03-27 17:58:35.000000000 +0100
-@@ -26,4 +26,7 @@
- */
- #define __bus_to_virt(a) __phys_to_virt(a)
+--- linux-2.6.29.4.orig/arch/arm/plat-mxc/include/mach/memory.h 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/plat-mxc/include/mach/memory.h 2009-06-04 11:24:55.000000000 +0200
+@@ -19,4 +19,7 @@
+ #define PHYS_OFFSET UL(0x80000000)
+ #endif
+/* Override the ARM default */
+#define CONSISTENT_DMA_SIZE SZ_4M
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/321-apf27-armadeus-mx2_adds_pwm_ressources.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/321-apf27-armadeus-mx2_adds_pwm_ressources.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/321-apf27-armadeus-mx2_adds_pwm_ressources.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -3,11 +3,11 @@
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/arch/arm/mach-mx2/devices.c
+Index: linux-2.6.29.4/arch/arm/mach-mx2/devices.c
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-mx2/devices.c 2009-04-14 19:03:43.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-mx2/devices.c 2009-04-14 19:04:01.000000000 +0200
-@@ -653,6 +653,25 @@
+--- linux-2.6.29.4.orig/arch/arm/mach-mx2/devices.c 2009-06-04 11:24:54.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/devices.c 2009-06-04 11:29:59.000000000 +0200
+@@ -657,6 +657,25 @@
.resource = mxc_ehci2_resources,
};
@@ -20,7 +20,7 @@
+ [1] = {
+ .start = (MXC_INT_PWM),
+ .end = (MXC_INT_PWM),
-+ .flags = IORESOURCE_IRQ,
++ .flags = IORESOURCE_IRQ,
+ },
+};
+
@@ -33,10 +33,10 @@
/* GPIO port description */
static struct mxc_gpio_port imx_gpio_ports[] = {
-Index: linux-2.6.29/arch/arm/mach-mx2/devices.h
+Index: linux-2.6.29.4/arch/arm/mach-mx2/devices.h
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-mx2/devices.h 2009-04-14 19:03:43.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-mx2/devices.h 2009-04-14 19:04:01.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/mach-mx2/devices.h 2009-06-04 11:24:54.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-mx2/devices.h 2009-06-04 11:24:55.000000000 +0200
@@ -30,3 +30,4 @@
extern struct platform_device mxc_otg;
extern struct platform_device mxc_ehci1;
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch 2009-06-04 09:04:09 UTC (rev 1326)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch 2009-06-04 09:51:39 UTC (rev 1327)
@@ -5,13 +5,13 @@
Signed-off-by: Nicolas Colombain <nic...@ar...>
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/drivers/video/imxfb.c
+Index: linux-2.6.29.4/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:35:11.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 19:37:34.000000000 +0200
-@@ -392,10 +392,10 @@
+--- linux-2.6.29.4.orig/drivers/video/imxfb.c 2009-06-04 11:24:55.000000000 +0200
++++ linux-2.6.29.4/drivers/video/imxfb.c 2009-06-04 11:28:59.000000000 +0200
+@@ -397,10 +397,10 @@
- writel(RMCR_LCDC_EN, fbi->regs + LCDC_RMCR);
+ clk_enable(fbi->clk);
- if (fbi->backlight_power)
- fbi->backlight_power(1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-04 09:04:18
|
Revision: 1326
http://armadeus.svn.sourceforge.net/armadeus/?rev=1326&view=rev
Author: artemys
Date: 2009-06-04 09:04:09 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[LINUX] Updates some 2.6.29 patches to prevent warnings when applying them
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/015-armadeus-logo-add_armadeus-project_tux.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/018-armadeus-i2c-imx-add_driver_to_linux_build_system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/041-armadeus-imx_irq.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/050-armadeus-add_custom_drivers_to_kconfig.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/092-armadeus-alsa-imx-ssi-tsc2102-integrate_driver_to_linux_build_system.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/015-armadeus-logo-add_armadeus-project_tux.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/015-armadeus-logo-add_armadeus-project_tux.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/015-armadeus-logo-add_armadeus-project_tux.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,6 +1,8 @@
---- linux-2.6.23/drivers/video/logo/Kconfig 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.23-imx/drivers/video/logo/Kconfig 2006-10-01 14:22:39.000000000 +0200
-@@ -70,5 +70,12 @@ config LOGO_M32R_CLUT224
+Index: linux-2.6.29.4/drivers/video/logo/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/video/logo/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/video/logo/Kconfig 2009-06-04 09:54:16.000000000 +0200
+@@ -82,4 +82,11 @@
depends on M32R
default y
@@ -12,9 +14,10 @@
+ Choose this if you want to have the Armadeus Tux as boot logo
+
endif # LOGO
-
---- linux-2.6.23/drivers/video/logo/logo_armadeus_clut224.ppm 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.23-imx/drivers/video/logo/logo_armadeus_clut224.ppm 2006-10-01 14:22:39.000000000 +0200
+Index: linux-2.6.29.4/drivers/video/logo/logo_armadeus_clut224.ppm
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.4/drivers/video/logo/logo_armadeus_clut224.ppm 2009-06-04 09:54:16.000000000 +0200
@@ -0,0 +1,19205 @@
+P3
+# CREATOR: The GIMP's PNM Filter Version 1.0
@@ -19221,17 +19224,19 @@
+0
+0
+0
---- linux-2.6.23/drivers/video/logo/logo.c 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.23-imx/drivers/video/logo/logo.c 2006-10-01 14:22:39.000000000 +0200
-@@ -33,6 +33,7 @@ extern const struct linux_logo logo_supe
+Index: linux-2.6.29.4/drivers/video/logo/logo.c
+===================================================================
+--- linux-2.6.29.4.orig/drivers/video/logo/logo.c 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/video/logo/logo.c 2009-06-04 09:54:16.000000000 +0200
+@@ -35,6 +35,7 @@
extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224;
extern const struct linux_logo logo_m32r_clut224;
+extern const struct linux_logo logo_armadeus_clut224;
-
- const struct linux_logo *fb_find_logo(int depth)
-@@ -101,6 +102,10 @@ const struct linux_logo *fb_find_logo(in
+ static int nologo;
+ module_param(nologo, bool, 0);
+@@ -115,6 +116,10 @@
/* M32R Linux logo */
logo = &logo_m32r_clut224;
#endif
@@ -19242,13 +19247,15 @@
}
return logo;
}
---- linux-2.6.23/drivers/video/logo/Makefile 2006-09-20 05:42:06.000000000 +0200
-+++ linux-2.6.23-imx/drivers/video/logo/Makefile 2006-10-01 14:22:39.000000000 +0200
-@@ -13,6 +13,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_
+Index: linux-2.6.29.4/drivers/video/logo/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/drivers/video/logo/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/video/logo/Makefile 2009-06-04 09:54:16.000000000 +0200
+@@ -15,6 +15,7 @@
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
+obj-$(CONFIG_LOGO_ARMADEUS_CLUT224) += logo_armadeus_clut224.o
- # How to generate logo's
+ obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/018-armadeus-i2c-imx-add_driver_to_linux_build_system.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/018-armadeus-i2c-imx-add_driver_to_linux_build_system.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/018-armadeus-i2c-imx-add_driver_to_linux_build_system.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,21 +1,25 @@
---- ref/linux-2.6.27/drivers/i2c/busses/Kconfig 2006-10-14 05:34:03.000000000 +0200
-+++ linux-2.6.27/drivers/i2c/busses/Kconfig 2007-01-14 00:35:15.000000000 +0100
-@@ -612,6 +612,12 @@ config I2C_PCA_ISA
-
+Index: linux-2.6.29.4/drivers/i2c/busses/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/i2c/busses/Kconfig 2009-06-04 10:07:14.000000000 +0200
++++ linux-2.6.29.4/drivers/i2c/busses/Kconfig 2009-06-04 10:37:46.000000000 +0200
+@@ -628,6 +628,12 @@
This driver can also be built as a module. If so, the module
will be called i2c-pca-isa.
-+
+
+config I2C_IMX
+ tristate "i2c bus on i.MX"
-+ depends on I2C
++ depends on I2C
+ help
+ i2c implementation on i.MX Freescale processors
-
++
This device is almost undetectable and using this driver on a
system which doesn't have this device will result in long
---- ref/linux-2.6.27/drivers/i2c/busses/Makefile 2006-10-14 05:34:03.000000000 +0200
-+++ linux-2.6.27/drivers/i2c/busses/Makefile 2007-01-14 00:35:15.000000000 +0100
-@@ -43,6 +43,7 @@ # Embebbed system I2C/SMBus host controller drivers
+ delays when I2C/SMBus chip drivers are loaded (e.g. at boot
+Index: linux-2.6.29.4/drivers/i2c/busses/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/drivers/i2c/busses/Makefile 2009-06-04 10:07:14.000000000 +0200
++++ linux-2.6.29.4/drivers/i2c/busses/Makefile 2009-06-04 10:37:09.000000000 +0200
+@@ -44,6 +44,7 @@
obj-$(CONFIG_I2C_PXA) += i2c-pxa.o
obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o
obj-$(CONFIG_I2C_SH7760) += i2c-sh7760.o
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/023-armadeus-fblcd-kconfig.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,6 +1,8 @@
---- linux-org/drivers/video/Kconfig 2006-10-14 05:34:03.000000000 +0200
-+++ linux-imx/drivers/video/Kconfig 2007-01-07 22:24:25.000000000 +0100
-@@ -384,6 +384,7 @@ config FB_SA1100
+Index: linux-2.6.29.4/drivers/video/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/video/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/video/Kconfig 2009-06-04 10:03:43.000000000 +0200
+@@ -395,6 +395,7 @@
If you plan to use the LCD display with your SA-1100 system, say
Y here.
@@ -8,7 +10,7 @@
config FB_IMX
tristate "Motorola i.MX LCD support"
depends on FB && ARM && ARCH_IMX
-@@ -392,6 +393,42 @@ config FB_IMX
+@@ -402,6 +403,42 @@
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,5 +1,7 @@
---- linux-org/arch/arm/mach-imx/include/mach/hardware.h
-+++ linux/arch/arm/mach-imx/include/mach/hardware.h
+Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h 2009-06-04 10:05:01.000000000 +0200
@@ -88,4 +88,8 @@
#include "mx1ads.h"
#endif
@@ -9,13 +11,14 @@
+#endif
+
#endif
---- linux-org/arch/arm/mach-imx/Kconfig
-+++ linux/arch/arm/mach-imx/Kconfig
+Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/mach-imx/Kconfig 2009-06-04 09:54:16.000000000 +0200
@@ -1,6 +1,10 @@
menu "IMX Implementations"
depends on ARCH_IMX
--
-+
+
+choice
+ prompt "Development board selection"
+ depends on ARCH_IMX
@@ -23,7 +26,7 @@
config ARCH_MX1ADS
bool "mx1ads"
depends on ARCH_IMX
-@@ -12,4 +16,38 @@
+@@ -8,4 +12,38 @@
help
Say Y here if you are using the Motorola MX1ADS board
@@ -62,8 +65,10 @@
+endchoice
+
endmenu
---- linux-org/arch/arm/mach-imx/Makefile
-+++ linux/arch/arm/mach-imx/Makefile
+Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/mach-imx/Makefile 2009-06-04 09:54:16.000000000 +0200
@@ -10,6 +10,7 @@
# Specific board support
@@ -72,9 +77,11 @@
# Support for blinky lights
led-y := leds.o
---- linux-org/arch/arm/mach-imx/Makefile.boot
-+++ linux/arch/arm/mach-imx/Makefile.boot
-@@ -1,1 +1,2 @@
+Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile.boot 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot 2009-06-04 09:54:16.000000000 +0200
+@@ -1,2 +1,3 @@
zreladdr-$(CONFIG_ARCH_MX1ADS) := 0x08008000
+ zreladdr-$(CONFIG_MACH_APF9328) := 0x08008000
-\ No newline at end of file
+
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/040-armadeus-imxmmc-correct_some_freezes.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,3 +1,9 @@
+
+With some SD cards i.MXL SDHC may hang up at detection stage. This patch
+tries to fix some cases.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+
Index: linux-2.6.29/drivers/mmc/host/imxmmc.c
===================================================================
--- linux-2.6.29.orig/drivers/mmc/host/imxmmc.c 2009-03-30 11:05:58.000000000 +0200
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/041-armadeus-imx_irq.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/041-armadeus-imx_irq.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/041-armadeus-imx_irq.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,7 +1,9 @@
---- linux-org/arch/arm/mach-imx/irq.c 2006-09-20 05:42:06.000000000 +0200
-+++ linux-imx/arch/arm/mach-imx/irq.c 2006-12-09 17:37:53.386928000 +0100
-@@ -103,6 +103,12 @@ imx_unmask_irq(unsigned int irq)
- }
+Index: linux-2.6.29.4/arch/arm/mach-imx/irq.c
+===================================================================
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/irq.c 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/arch/arm/mach-imx/irq.c 2009-06-04 09:54:16.000000000 +0200
+@@ -122,6 +122,12 @@
+ #endif /* CONFIG_FIQ */
static int
+imx_irq_type(unsigned int _irq, unsigned int type)
@@ -13,7 +15,7 @@
imx_gpio_irq_type(unsigned int _irq, unsigned int type)
{
unsigned int irq_type = 0, irq, reg, bit;
-@@ -239,6 +245,7 @@ static struct irq_chip imx_internal_chip
+@@ -256,6 +262,7 @@
.ack = imx_mask_irq,
.mask = imx_mask_irq,
.unmask = imx_unmask_irq,
@@ -21,4 +23,3 @@
};
static struct irq_chip imx_gpio_chip = {
-
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/050-armadeus-add_custom_drivers_to_kconfig.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/050-armadeus-add_custom_drivers_to_kconfig.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/050-armadeus-add_custom_drivers_to_kconfig.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,20 +1,24 @@
This patch adds the possibility to have custom Armadeus drivers built in kernel or compiled as modules
---- linux-org/drivers/usb/Kconfig 2006-10-14 05:34:03.000000000 +0200
-+++ linux-imx/drivers/usb/Kconfig 2006-12-06 22:28:32.000000000 +0100
-@@ -148,3 +148,5 @@
- source "drivers/usb/gadget/Kconfig"
-
+Index: linux-2.6.29.4/drivers/usb/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/usb/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/usb/Kconfig 2009-06-04 10:03:42.000000000 +0200
+@@ -153,3 +153,5 @@
+ source "drivers/usb/otg/Kconfig"
+
endif # USB_SUPPORT
+
+source "drivers/armadeus/Kconfig"
---- linux-org/drivers/Makefile.org 2007-05-09 10:48:51.000000000 +0200
-+++ linux-imx/drivers/Makefile 2007-05-09 10:57:09.000000000 +0200
-@@ -96,6 +96,7 @@
+Index: linux-2.6.29.4/drivers/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/drivers/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/Makefile 2009-06-04 09:54:16.000000000 +0200
+@@ -102,6 +102,7 @@
obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/
obj-$(CONFIG_OF) += of/
+obj-$(CONFIG_ARMADEUS_DRIVERS) += armadeus/
obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/
- obj-$(CONFIG_REGULATOR) += regulator/
+ obj-$(CONFIG_STAGING) += staging/
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,6 +1,8 @@
---- linux-org/drivers/spi/Kconfig 2007-09-22 02:39:35.000000000 +0200
-+++ linux/drivers/spi/Kconfig 2007-09-16 11:08:17.000000000 +0200
-@@ -243,6 +243,14 @@ comment "SPI Protocol Masters"
+Index: linux-2.6.29.4/drivers/spi/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/drivers/spi/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/spi/Kconfig 2009-06-04 10:03:41.000000000 +0200
+@@ -248,6 +248,14 @@
sysfs interface, with each line presented as a kind of GPIO
exposing both switch control and diagnostic feedback.
@@ -15,10 +17,12 @@
#
# Add new SPI protocol masters in alphabetical order above this line
#
---- linux-2.6.23.original/drivers/spi/Makefile 2007-09-22 02:39:35.000000000 +0200
-+++ linux-2.6.23.mod/drivers/spi/Makefile 2007-09-16 11:08:16.000000000 +0200
-@@ -35,6 +35,7 @@
- obj-$(CONFIG_SPI_AT25) += at25.o
+Index: linux-2.6.29.4/drivers/spi/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/drivers/spi/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/drivers/spi/Makefile 2009-06-04 09:54:16.000000000 +0200
+@@ -35,6 +35,7 @@
+ # SPI protocol drivers (device/link on bus)
obj-$(CONFIG_SPI_SPIDEV) += spidev.o
obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o
+obj-$(CONFIG_SPI_TSC2102) += tsc2102.o
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/092-armadeus-alsa-imx-ssi-tsc2102-integrate_driver_to_linux_build_system.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/092-armadeus-alsa-imx-ssi-tsc2102-integrate_driver_to_linux_build_system.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/092-armadeus-alsa-imx-ssi-tsc2102-integrate_driver_to_linux_build_system.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -1,6 +1,8 @@
---- linux-org/sound/arm/Kconfig 2007-10-12 18:43:44.000000000 +0200
-+++ linux/sound/arm/Kconfig 2008-07-17 17:39:17.000000000 +0200
-@@ -41,6 +41,18 @@
+Index: linux-2.6.29.4/sound/arm/Kconfig
+===================================================================
+--- linux-2.6.29.4.orig/sound/arm/Kconfig 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/sound/arm/Kconfig 2009-06-04 10:03:42.000000000 +0200
+@@ -50,5 +50,17 @@
Say Y or M if you want to support any AC97 codec attached to
the PXA2xx AC97 interface.
@@ -18,11 +20,12 @@
+
endif # SND_ARM
+Index: linux-2.6.29.4/sound/arm/Makefile
+===================================================================
+--- linux-2.6.29.4.orig/sound/arm/Makefile 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.4/sound/arm/Makefile 2009-06-04 10:03:42.000000000 +0200
+@@ -17,3 +17,7 @@
---- linux-org/sound/arm/Makefile 2007-10-12 18:43:44.000000000 +0200
-+++ linux/sound/arm/Makefile 2008-07-17 15:53:07.000000000 +0200
-@@ -13,3 +13,7 @@
-
obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
snd-pxa2xx-ac97-objs := pxa2xx-ac97.o
+
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -7,11 +7,11 @@
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/drivers/video/imxfb.c
+Index: linux-2.6.29.4/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:52:35.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 09:14:31.000000000 +0200
-@@ -466,6 +466,7 @@
+--- linux-2.6.29.4.orig/drivers/video/imxfb.c 2009-06-04 10:38:09.000000000 +0200
++++ linux-2.6.29.4/drivers/video/imxfb.c 2009-06-04 10:39:02.000000000 +0200
+@@ -471,6 +471,7 @@
pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
var->yres, var->vsync_len,
var->upper_margin, var->lower_margin);
@@ -19,7 +19,7 @@
#if DEBUG_VAR
if (var->xres < 16 || var->xres > 1024)
-@@ -523,9 +524,6 @@
+@@ -528,9 +529,6 @@
pcr |= fbi->pcr & ~0x3F;
writel(pcr, fbi->regs + LCDC_PCR);
@@ -29,7 +29,7 @@
return 0;
}
-@@ -719,6 +717,12 @@
+@@ -724,6 +722,12 @@
goto failed_cmap;
imxfb_set_par(info);
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-06-04 07:48:59 UTC (rev 1325)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-06-04 09:04:09 UTC (rev 1326)
@@ -6,10 +6,10 @@
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
+Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/imxfb.h
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 20:07:17.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 21:11:01.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-06-04 10:38:07.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/imxfb.h 2009-06-04 10:38:09.000000000 +0200
@@ -14,6 +14,7 @@
#define PCR_BPIX_8 (3 << 25)
#define PCR_BPIX_12 (4 << 25)
@@ -18,10 +18,10 @@
#define PCR_PIXPOL (1 << 24)
#define PCR_FLMPOL (1 << 23)
#define PCR_LPPOL (1 << 22)
-Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
+Index: linux-2.6.29.4/arch/arm/plat-mxc/include/mach/imxfb.h
===================================================================
---- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 21:09:24.000000000 +0200
-+++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 21:11:39.000000000 +0200
+--- linux-2.6.29.4.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-06-04 10:38:09.000000000 +0200
++++ linux-2.6.29.4/arch/arm/plat-mxc/include/mach/imxfb.h 2009-06-04 10:38:09.000000000 +0200
@@ -19,6 +19,7 @@
#define PCR_BPIX_16 (5 << 25)
#define PCR_BPIX_18 (6 << 25)
@@ -30,11 +30,11 @@
#define PCR_PIXPOL (1 << 24)
#define PCR_FLMPOL (1 << 23)
#define PCR_LPPOL (1 << 22)
-Index: linux-2.6.29/drivers/video/imxfb.c
+Index: linux-2.6.29.4/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-27 21:07:41.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 21:11:01.000000000 +0200
-@@ -523,7 +523,17 @@
+--- linux-2.6.29.4.orig/drivers/video/imxfb.c 2009-06-04 10:38:09.000000000 +0200
++++ linux-2.6.29.4/drivers/video/imxfb.c 2009-06-04 10:38:47.000000000 +0200
+@@ -528,7 +528,17 @@
/* add sync polarities */
pcr |= fbi->pcr & ~0x3F;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-04 07:49:03
|
Revision: 1325
http://armadeus.svn.sourceforge.net/armadeus/?rev=1325&view=rev
Author: artemys
Date: 2009-06-04 07:48:59 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[LINUX] Divides 030-armadeus-add_USB_registers.patch
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/028-armadeus-add_reg8_macro_to_hardware_h.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/029-armadeus-add_csi_and_spi_registers_to_imx-regs_h.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-fixes_typo_for_usbdrcv_in_imx-regs_h.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-add_USB_registers.patch
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/028-armadeus-add_reg8_macro_to_hardware_h.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/028-armadeus-add_reg8_macro_to_hardware_h.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/028-armadeus-add_reg8_macro_to_hardware_h.patch 2009-06-04 07:48:59 UTC (rev 1325)
@@ -0,0 +1,13 @@
+Index: linux-2.6.29/arch/arm/mach-imx/include/mach/hardware.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-05-01 11:35:31.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/hardware.h 2009-05-01 13:59:45.000000000 +0200
+@@ -24,6 +24,8 @@
+ #include "imx-regs.h"
+
+ #ifndef __ASSEMBLY__
++# define __REG8(x) (*((volatile u8 *)IO_ADDRESS(x)))
++
+ # define __REG(x) (*((volatile u32 *)IO_ADDRESS(x)))
+
+ # define __REG2(x,y) (*(volatile u32 *)((u32)&__REG(x) + (y)))
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/029-armadeus-add_csi_and_spi_registers_to_imx-regs_h.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/029-armadeus-add_csi_and_spi_registers_to_imx-regs_h.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/029-armadeus-add_csi_and_spi_registers_to_imx-regs_h.patch 2009-06-04 07:48:59 UTC (rev 1325)
@@ -0,0 +1,48 @@
+
+JB: I think these declarations should only be in the corresponding driver...
+
+Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 11:33:45.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 14:02:48.000000000 +0200
+@@ -373,4 +373,40 @@
+ #define TSTAT_CAPT (1<<1)
+ #define TSTAT_COMP (1<<0)
+
++/*
++ * CSI register
++ */
++#define CSICR1 __REG(0x00 + IMX_CSI_BASE)
++#define CSICR2 __REG(0x04 + IMX_CSI_BASE)
++#define CSISR __REG(0x08 + IMX_CSI_BASE)
++#define CSISTATR __REG(0x0C + IMX_CSI_BASE)
++#define CSIRXR __REG(0x10 + IMX_CSI_BASE)
++
++/* CSI bit fields */
++#define CSICR1_RXOR_INTEN (1<<24)
++#define CSICR1_RXFF_INTEN (1<<18)
++#define CSICR1_RXFF_LEVEL(x) ((x & 0x3)<<19)
++#define CSICR1_SOF_POL (1<<17)
++#define CSICR1_SOF_INTEN (1<<16)
++#define CSICR1_MCLKDIV(x) ((x & 0xf)<<12)
++#define CSICR1_MCLKEN (1<<9)
++#define CSICR1_FCC (1<<8)
++#define CSICR1_BIG_ENDIAN (1<<7)
++#define CSICR1_CLR_STATFIFO (1<<6)
++#define CSICR1_CLR_RXFIFO (1<<5)
++#define CSICR1_GCLK_MODE (1<<4)
++#define CSICR1_INV_DATA (1<<3)
++#define CSICR1_REDGE (1<<1)
++#define CSICR1_ENABLE (1)
++
++/* SPI regiters */
++#define SPI1_RXDATA __REG(IMX_SPI1_BASE + 0x00)
++#define SPI1_TXDATA __REG(IMX_SPI1_BASE + 0x04)
++#define SPI1_CONTROL __REG(IMX_SPI1_BASE + 0x08)
++#define SPI1_INT __REG(IMX_SPI1_BASE + 0x0c)
++#define SPI1_TEST __REG(IMX_SPI1_BASE + 0x10)
++#define SPI1_PERIOD __REG(IMX_SPI1_BASE + 0x14)
++#define SPI1_DMA __REG(IMX_SPI1_BASE + 0x18)
++#define SPI1_RESET __REG(IMX_SPI1_BASE + 0x1c)
++
+ #endif // _IMX_REGS_H
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-add_USB_registers.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-add_USB_registers.patch 2009-06-04 07:11:47 UTC (rev 1324)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-add_USB_registers.patch 2009-06-04 07:48:59 UTC (rev 1325)
@@ -1,67 +0,0 @@
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/hardware.h
-===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-05-01 11:35:31.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/hardware.h 2009-05-01 13:59:45.000000000 +0200
-@@ -24,6 +24,8 @@
- #include "imx-regs.h"
-
- #ifndef __ASSEMBLY__
-+# define __REG8(x) (*((volatile u8 *)IO_ADDRESS(x)))
-+
- # define __REG(x) (*((volatile u32 *)IO_ADDRESS(x)))
-
- # define __REG2(x,y) (*(volatile u32 *)((u32)&__REG(x) + (y)))
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h
-===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 11:33:45.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 14:02:48.000000000 +0200
-@@ -186,7 +186,7 @@
- #define PB19_AF_SSI_TXCLK ( GPIO_PORTB | GPIO_AF | 19 )
- #define PB20_PF_USBD_AFE ( GPIO_PORTB | GPIO_PF | 20 )
- #define PB21_PF_USBD_OE ( GPIO_PORTB | GPIO_PF | 21 )
--#define PB22_PFUSBD_RCV ( GPIO_PORTB | GPIO_PF | 22 )
-+#define PB22_PF_USBD_RCV ( GPIO_PORTB | GPIO_PF | 22 )
- #define PB23_PF_USBD_SUSPND ( GPIO_PORTB | GPIO_PF | 23 )
- #define PB24_PF_USBD_VP ( GPIO_PORTB | GPIO_PF | 24 )
- #define PB25_PF_USBD_VM ( GPIO_PORTB | GPIO_PF | 25 )
-@@ -373,4 +373,40 @@
- #define TSTAT_CAPT (1<<1)
- #define TSTAT_COMP (1<<0)
-
-+/*
-+ * CSI register
-+ */
-+#define CSICR1 __REG(0x00 + IMX_CSI_BASE)
-+#define CSICR2 __REG(0x04 + IMX_CSI_BASE)
-+#define CSISR __REG(0x08 + IMX_CSI_BASE)
-+#define CSISTATR __REG(0x0C + IMX_CSI_BASE)
-+#define CSIRXR __REG(0x10 + IMX_CSI_BASE)
-+
-+/* CSI bit fields */
-+#define CSICR1_RXOR_INTEN (1<<24)
-+#define CSICR1_RXFF_INTEN (1<<18)
-+#define CSICR1_RXFF_LEVEL(x) ((x & 0x3)<<19)
-+#define CSICR1_SOF_POL (1<<17)
-+#define CSICR1_SOF_INTEN (1<<16)
-+#define CSICR1_MCLKDIV(x) ((x & 0xf)<<12)
-+#define CSICR1_MCLKEN (1<<9)
-+#define CSICR1_FCC (1<<8)
-+#define CSICR1_BIG_ENDIAN (1<<7)
-+#define CSICR1_CLR_STATFIFO (1<<6)
-+#define CSICR1_CLR_RXFIFO (1<<5)
-+#define CSICR1_GCLK_MODE (1<<4)
-+#define CSICR1_INV_DATA (1<<3)
-+#define CSICR1_REDGE (1<<1)
-+#define CSICR1_ENABLE (1)
-+
-+/* SPI regiters */
-+#define SPI1_RXDATA __REG(IMX_SPI1_BASE + 0x00)
-+#define SPI1_TXDATA __REG(IMX_SPI1_BASE + 0x04)
-+#define SPI1_CONTROL __REG(IMX_SPI1_BASE + 0x08)
-+#define SPI1_INT __REG(IMX_SPI1_BASE + 0x0c)
-+#define SPI1_TEST __REG(IMX_SPI1_BASE + 0x10)
-+#define SPI1_PERIOD __REG(IMX_SPI1_BASE + 0x14)
-+#define SPI1_DMA __REG(IMX_SPI1_BASE + 0x18)
-+#define SPI1_RESET __REG(IMX_SPI1_BASE + 0x1c)
-+
- #endif // _IMX_REGS_H
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-fixes_typo_for_usbdrcv_in_imx-regs_h.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-fixes_typo_for_usbdrcv_in_imx-regs_h.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/030-armadeus-fixes_typo_for_usbdrcv_in_imx-regs_h.patch 2009-06-04 07:48:59 UTC (rev 1325)
@@ -0,0 +1,13 @@
+Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 11:33:45.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/imx-regs.h 2009-05-01 14:02:48.000000000 +0200
+@@ -186,7 +186,7 @@
+ #define PB19_AF_SSI_TXCLK ( GPIO_PORTB | GPIO_AF | 19 )
+ #define PB20_PF_USBD_AFE ( GPIO_PORTB | GPIO_PF | 20 )
+ #define PB21_PF_USBD_OE ( GPIO_PORTB | GPIO_PF | 21 )
+-#define PB22_PFUSBD_RCV ( GPIO_PORTB | GPIO_PF | 22 )
++#define PB22_PF_USBD_RCV ( GPIO_PORTB | GPIO_PF | 22 )
+ #define PB23_PF_USBD_SUSPND ( GPIO_PORTB | GPIO_PF | 23 )
+ #define PB24_PF_USBD_VP ( GPIO_PORTB | GPIO_PF | 24 )
+ #define PB25_PF_USBD_VM ( GPIO_PORTB | GPIO_PF | 25 )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-04 07:11:56
|
Revision: 1324
http://armadeus.svn.sourceforge.net/armadeus/?rev=1324&view=rev
Author: artemys
Date: 2009-06-04 07:11:47 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
[TEST] Gives correct name to Linux default configurations
Added Paths:
-----------
trunk/buildroot/local/apf27_test/linux-2.6.29.4.config
trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config
Removed Paths:
-------------
trunk/buildroot/local/apf27_test/linux-2.6.29.config
trunk/buildroot/local/apf9328_test/linux-2.6.29.config
Copied: trunk/buildroot/local/apf27_test/linux-2.6.29.4.config (from rev 1321, trunk/buildroot/local/apf27_test/linux-2.6.29.config)
===================================================================
--- trunk/buildroot/local/apf27_test/linux-2.6.29.4.config (rev 0)
+++ trunk/buildroot/local/apf27_test/linux-2.6.29.4.config 2009-06-04 07:11:47 UTC (rev 1324)
@@ -0,0 +1,1787 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.29.4
+# Wed Jun 3 09:02:33 2009
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_MTD_XIP=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_CLASSIC_RCU=y
+# CONFIG_TREE_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES 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_EMBEDDED=y
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_VM_EVENT_COUNTERS=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_MARKERS=y
+CONFIG_OPROFILE=y
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_FREEZER=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+# CONFIG_ARCH_AT91 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_MV78XX0 is not set
+CONFIG_ARCH_MXC=y
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_W90X900 is not set
+
+#
+# Freescale MXC Implementations
+#
+# CONFIG_ARCH_MX1 is not set
+CONFIG_ARCH_MX2=y
+# CONFIG_ARCH_MX3 is not set
+
+#
+# MX2 family CPU support
+#
+CONFIG_MACH_MX27=y
+
+#
+# MX2 Platforms
+#
+CONFIG_MACH_APF27=y
+# CONFIG_MACH_MX27ADS is not set
+# CONFIG_MACH_PCM038 is not set
+# CONFIG_MXC_IRQ_PRIOR is not set
+CONFIG_MXC_ULPI=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_NOIFAR=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PREEMPT=y
+CONFIG_HZ=100
+CONFIG_AEABI=y
+CONFIG_OABI_COMPAT=y
+CONFIG_ARCH_FLATMEM_HAS_HOLES=y
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE=""
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+
+#
+# CPU Power Management
+#
+# CONFIG_CPU_FREQ is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_FREQ_IMX27 is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_FPE_NWFPE is not set
+# CONFIG_FPE_FASTFPE is not set
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_VERBOSE=y
+CONFIG_CAN_PM_TRACE=y
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_APM_EMULATION is not set
+# CONFIG_USE_APF27DEV_IMX_LED_FOR_PM is not set
+# CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_COMPAT_NET_DEV_OPS=y
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# 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_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_PHONET is not set
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=m
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_NL80211=y
+CONFIG_WIRELESS_OLD_REGULATORY=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
+CONFIG_LIB80211=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+
+#
+# Rate control algorithm selection
+#
+CONFIG_MAC80211_RC_PID=y
+CONFIG_MAC80211_RC_MINSTREL=y
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel"
+# 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
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+# CONFIG_MTD_CFI_I2 is not set
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# CONFIG_MTD_XIP is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+# CONFIG_MTD_ARM_INTEGRATOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_GPIO is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
+CONFIG_MTD_NAND_MXC=y
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+# CONFIG_EEPROM_LEGACY is not set
+# CONFIG_EEPROM_93CX6 is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SCH=y
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_LIBFC is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_PHYLIB 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
+# CONFIG_ENC28J60 is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_DNET is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_B44 is not set
+CONFIG_FEC_OLD=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+CONFIG_WLAN_80211=y
+CONFIG_LIBERTAS=m
+# CONFIG_LIBERTAS_USB is not set
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+# CONFIG_LIBERTAS_THINFIRM is not set
+# CONFIG_USB_ZD1201 is not set
+# CONFIG_USB_NET_RNDIS_WLAN is not set
+# CONFIG_RTL8187 is not set
+# CONFIG_MAC80211_HWSIM is not set
+# CONFIG_P54_COMMON is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_HOSTAP is not set
+# CONFIG_B43 is not set
+# CONFIG_B43LEGACY is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_RT2X00=m
+# CONFIG_RT2500USB is not set
+CONFIG_RT73USB=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+# CONFIG_RT2X00_DEBUG is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_FUJITSU is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_INEXIO is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+# CONFIG_TOUCHSCREEN_PENMOUNT is not set
+# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
+# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
+CONFIG_TOUCHSCREEN_TSC2102=m
+# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
+# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
+# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_HELPER_AUTO=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_MXC=y
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_IMX is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_GPIO is not set
+CONFIG_SPI_IMX=y
+CONFIG_SPI_MXC_SELECT1=y
+CONFIG_SPI_MXC_SELECT2=y
+# CONFIG_SPI_MXC_SELECT3 is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+CONFIG_SPI_TSC2102=m
+CONFIG_ARCH_REQUIRE_GPIOLIB=y
+CONFIG_GPIOLIB=y
+# CONFIG_GPIO_SYSFS is not set
+
+#
+# Memory mapped GPIO expanders:
+#
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+
+#
+# PCI GPIO expanders:
+#
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=m
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_AD7414 is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADCXX is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7462 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7473 is not set
+# CONFIG_SENSORS_ADT7475 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_LTC4245 is not set
+# CONFIG_SENSORS_MAX1111 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_THERMAL is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_IMX_WDT=m
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_MFD_ASIC3 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_TC6393XB is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_PCF50633 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_COMMON=m
+# CONFIG_VIDEO_ALLOW_V4L1 is not set
+CONFIG_VIDEO_V4L1_COMPAT=y
+# CONFIG_DVB_CORE is not set
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_CUSTOMIZE=y
+# CONFIG_MEDIA_TUNER_SIMPLE is not set
+# CONFIG_MEDIA_TUNER_TDA8290 is not set
+# CONFIG_MEDIA_TUNER_TDA827X is not set
+# CONFIG_MEDIA_TUNER_TDA18271 is not set
+# CONFIG_MEDIA_TUNER_TDA9887 is not set
+# CONFIG_MEDIA_TUNER_TEA5761 is not set
+# CONFIG_MEDIA_TUNER_TEA5767 is not set
+# CONFIG_MEDIA_TUNER_MT20XX is not set
+# CONFIG_MEDIA_TUNER_MT2060 is not set
+# CONFIG_MEDIA_TUNER_MT2266 is not set
+# CONFIG_MEDIA_TUNER_MT2131 is not set
+# CONFIG_MEDIA_TUNER_QT1010 is not set
+# CONFIG_MEDIA_TUNER_XC2028 is not set
+# CONFIG_MEDIA_TUNER_XC5000 is not set
+# CONFIG_MEDIA_TUNER_MXL5005S is not set
+# CONFIG_MEDIA_TUNER_MXL5007T is not set
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_CONTIG=m
+CONFIG_VIDEO_CAPTURE_DRIVERS=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+
+#
+# Encoders/decoders and other helper chips
+#
+
+#
+# Audio decoders
+#
+# 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
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_OV7670 is not set
+CONFIG_VIDEO_OV96xx=m
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+
+#
+# Video and audio decoders
+#
+# CONFIG_VIDEO_CX25840 is not set
+
+#
+# MPEG video encoders
+#
+# CONFIG_VIDEO_CX2341X is not set
+
+#
+# Video encoders
+#
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_AD9889 is not set
+
+#
+# Video improvement chips
+#
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_VIDEO_VIVI is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+CONFIG_SOC_CAMERA=m
+# CONFIG_SOC_CAMERA_MT9M001 is not set
+# CONFIG_SOC_CAMERA_MT9M111 is not set
+# CONFIG_SOC_CAMERA_MT9T031 is not set
+# CONFIG_SOC_CAMERA_MT9V022 is not set
+# CONFIG_SOC_CAMERA_TW9910 is not set
+# CONFIG_SOC_CAMERA_PLATFORM is not set
+# CONFIG_SOC_CAMERA_OV772X is not set
+# CONFIG_V4L_USB_DRIVERS is not set
+CONFIG_VIDEO_MX27=m
+# CONFIG_RADIO_ADAPTERS is not set
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+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=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_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_IMX=y
+CONFIG_FB_IMX_SHARP_LQ043_TFT=y
+# CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT is not set
+# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
+# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
+# CONFIG_FB_IMX_MOTOROLA_A910_TFT is not set
+# CONFIG_FB_MXC is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+# CONFIG_LCD_PLATFORM is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
+CONFIG_BACKLIGHT_GENERIC=m
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+# CONFIG_FONT_8x16 is not set
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+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 is not set
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_HRTIMER is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+CONFIG_SND_ARM=y
+CONFIG_SND_IMX2_PCM=m
+CONFIG_SND_IMX_TSC2102=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_HID_PID is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_COMPAT=y
+# CONFIG_HID_A4TECH is not set
+# CONFIG_HID_APPLE is not set
+# CONFIG_HID_BELKIN is not set
+# CONFIG_HID_CHERRY is not set
+# CONFIG_HID_CHICONY is not set
+# CONFIG_HID_CYPRESS is not set
+# CONFIG_HID_EZKEY is not set
+# CONFIG_HID_GYRATION is not set
+# CONFIG_HID_LOGITECH is not set
+# CONFIG_HID_MICROSOFT is not set
+# CONFIG_HID_MONTEREY is not set
+# CONFIG_HID_NTRIG is not set
+# CONFIG_HID_PANTHERLORD is not set
+# CONFIG_HID_PETALYNX is not set
+# CONFIG_HID_SAMSUNG is not set
+# CONFIG_HID_SONY is not set
+# CONFIG_HID_SUNPLUS is not set
+# CONFIG_GREENASIA_FF is not set
+# CONFIG_HID_TOPSEED is not set
+# CONFIG_THRUSTMASTER_FF is not set
+# CONFIG_ZEROPLUS_FF is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+CONFIG_USB_DEBUG=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_MON=y
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+CONFIG_USB_EHCI_MXC=y
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=y
+CONFIG_USB_PRINTER=y
+CONFIG_USB_WDM=y
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
+#
+
+#
+# see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_VST is not set
+# CONFIG_USB_GADGET is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+
+#
+# Armadeus specific drivers
+#
+CONFIG_ARMADEUS_DRIVERS=y
+
+#
+# Misc.
+#
+# CONFIG_ARMADEUS_GENERIC_DRIVER is not set
+CONFIG_ARMADEUS_GPIO_DRIVER=m
+# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
+CONFIG_ARMADEUS_MAX1027=m
+
+#
+# FPGA related
+#
+
+#
+# FPGA Drivers
+#
+CONFIG_ARMADEUS_FPGA_DRIVERS=y
+
+#
+# Drivers for configuring and testing the FPGA
+#
+CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
+
+#
+# Others drivers for the FPGA
+#
+# CONFIG_ARMADEUS_I2C_OCORE_IRQMNG is not set
+# CONFIG_ARMADEUS_PS2KBD_DRIVER is not set
+# CONFIG_ARMADEUS_WISHBONE_EXAMPLE_DRIVERS is not set
+# CONFIG_POD_DRIVERS is not set
+
+#
+# Handheld related
+#
+# CONFIG_ARMADEUS_PWM_DRIVER is not set
+CONFIG_IMX_BACKLIGHT=m
+
+#
+# Communication bus related
+#
+# CONFIG_ARMADEUS_ISP1761 is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK_BOUNCE=y
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_SDHCI is not set
+CONFIG_MMC_MXC=y
+# CONFIG_MMC_SPI is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_NEW_LEDS is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+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
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+CONFIG_RTC_DRV_DS1374=y
+# CONFIG_RTC_DRV_DS1374_LEGACY is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_DMADEVICES is not set
+
+#
+# MXC support drivers
+#
+
+#
+# MXC VPU(Video Processing Unit) support
+#
+CONFIG_MXC_VPU=y
+CONFIG_MXC_VPU_DEBUG=y
+# CONFIG_REGULATOR is not set
+# CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+CONFIG_EXT2_FS_SECURITY=y
+CONFIG_EXT2_FS_XIP=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT4_FS is not set
+CONFIG_FS_XIP=y
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+CONFIG_FILE_LOCKING=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+# CONFIG_NFSD is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=y
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# 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
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_FRAME_POINTER=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_RING_BUFFER=y
+CONFIG_TRACING=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_DEBUG_USER is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
Property changes on: trunk/buildroot/local/apf27_test/linux-2.6.29.4.config
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: trunk/buildroot/local/apf27_test/linux-2.6.29.config
===================================================================
--- trunk/buildroot/local/apf27_test/linux-2.6.29.config 2009-06-03 22:29:56 UTC (rev 1323)
+++ trunk/buildroot/local/apf27_test/linux-2.6.29.config 2009-06-04 07:11:47 UTC (rev 1324)
@@ -1,1787 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29.4
-# Wed Jun 3 09:02:33 2009
-#
-CONFIG_ARM=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_MMU=y
-# CONFIG_NO_IOPORT is not set
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_ARCH_HAS_ILOG2_U32 is not set
-# CONFIG_ARCH_HAS_ILOG2_U64 is not set
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_MTD_XIP=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-# CONFIG_BSD_PROCESS_ACCT is not set
-# CONFIG_TASKSTATS is not set
-# CONFIG_AUDIT is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_CLASSIC_RCU=y
-# CONFIG_TREE_RCU is not set
-# CONFIG_PREEMPT_RCU is not set
-# CONFIG_TREE_RCU_TRACE is not set
-# CONFIG_PREEMPT_RCU_TRACE is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_GROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_USER_SCHED=y
-# CONFIG_CGROUP_SCHED is not set
-# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-# CONFIG_RELAY is not set
-# CONFIG_NAMESPACES 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_EMBEDDED=y
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_VM_EVENT_COUNTERS=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-# CONFIG_SLUB is not set
-# CONFIG_SLOB is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_MARKERS=y
-CONFIG_OPROFILE=y
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_MODULE_FORCE_UNLOAD is not set
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_BLOCK=y
-# CONFIG_LBD is not set
-# CONFIG_BLK_DEV_IO_TRACE is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-# CONFIG_IOSCHED_AS is not set
-CONFIG_IOSCHED_DEADLINE=y
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_DEFAULT_AS is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_FREEZER=y
-
-#
-# System Type
-#
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_AT91 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MV78XX0 is not set
-CONFIG_ARCH_MXC=y
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_W90X900 is not set
-
-#
-# Freescale MXC Implementations
-#
-# CONFIG_ARCH_MX1 is not set
-CONFIG_ARCH_MX2=y
-# CONFIG_ARCH_MX3 is not set
-
-#
-# MX2 family CPU support
-#
-CONFIG_MACH_MX27=y
-
-#
-# MX2 Platforms
-#
-CONFIG_MACH_APF27=y
-# CONFIG_MACH_MX27ADS is not set
-# CONFIG_MACH_PCM038 is not set
-# CONFIG_MXC_IRQ_PRIOR is not set
-CONFIG_MXC_ULPI=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_ARM926T=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5TJ=y
-CONFIG_CPU_PABRT_NOIFAR=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-
-#
-# Processor Features
-#
-CONFIG_ARM_THUMB=y
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_DISABLE is not set
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-# CONFIG_OUTER_CACHE is not set
-
-#
-# Bus support
-#
-# CONFIG_PCI_SYSCALL is not set
-# CONFIG_ARCH_SUPPORTS_MSI is not set
-# CONFIG_PCCARD is not set
-
-#
-# Kernel Features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_VMSPLIT_3G=y
-# CONFIG_VMSPLIT_2G is not set
-# CONFIG_VMSPLIT_1G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_PREEMPT=y
-CONFIG_HZ=100
-CONFIG_AEABI=y
-CONFIG_OABI_COMPAT=y
-CONFIG_ARCH_FLATMEM_HAS_HOLES=y
-# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
-# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4096
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-CONFIG_UNEVICTABLE_LRU=y
-CONFIG_ALIGNMENT_TRAP=y
-
-#
-# Boot options
-#
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=""
-# CONFIG_XIP_KERNEL is not set
-# CONFIG_KEXEC is not set
-
-#
-# CPU Power Management
-#
-# CONFIG_CPU_FREQ is not set
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_FREQ_IMX27 is not set
-
-#
-# Floating point emulation
-#
-
-#
-# At least one emulation must be selected
-#
-# CONFIG_FPE_NWFPE is not set
-# CONFIG_FPE_FASTFPE is not set
-# CONFIG_VFP is not set
-
-#
-# Userspace binary formats
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_HAVE_AOUT=y
-# CONFIG_BINFMT_AOUT is not set
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Power management options
-#
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_VERBOSE=y
-CONFIG_CAN_PM_TRACE=y
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_APM_EMULATION is not set
-# CONFIG_USE_APF27DEV_IMX_LED_FOR_PM is not set
-# CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM is not set
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_COMPAT_NET_DEV_OPS=y
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-# 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_IP_MROUTE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_XFRM_TUNNEL is not set
-CONFIG_INET_TUNNEL=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=y
-# CONFIG_IPV6_PRIVACY is not set
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IPV6_OPTIMISTIC_DAD is not set
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_IPV6_MIP6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
-# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_IPV6_SIT=y
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_TUNNEL is not set
-# CONFIG_IPV6_MULTIPLE_TABLES is not set
-# CONFIG_IPV6_MROUTE is not set
-# CONFIG_NETWORK_SECMARK is not set
-# CONFIG_NETFILTER is not set
-# CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_NET_DSA is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_SCHED is not set
-# CONFIG_DCB is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
-# CONFIG_AF_RXRPC is not set
-# CONFIG_PHONET is not set
-CONFIG_WIRELESS=y
-CONFIG_CFG80211=m
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_NL80211=y
-CONFIG_WIRELESS_OLD_REGULATORY=y
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-
-#
-# Rate control algorithm selection
-#
-CONFIG_MAC80211_RC_PID=y
-CONFIG_MAC80211_RC_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel"
-# 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
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=m
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_SYS_HYPERVISOR is not set
-# CONFIG_CONNECTOR is not set
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_MTD_OOPS is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-# CONFIG_MTD_CFI_I2 is not set
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-# CONFIG_MTD_OTP is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_XIP is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-CONFIG_MTD_PHYSMAP=y
-# CONFIG_MTD_PHYSMAP_COMPAT is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-# CONFIG_MTD_PLATRAM is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_GPIO is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-# CONFIG_MTD_NAND_PLATFORM is not set
-# CONFIG_MTD_ALAUDA is not set
-CONFIG_MTD_NAND_MXC=y
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-
-#
-# UBI - Unsorted block images
-#
-# CONFIG_MTD_UBI is not set
-# CONFIG_PARPORT is not set
-CONFIG_BLK_DEV=y
-# CONFIG_BLK_DEV_COW_COMMON is not set
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_CDROM_PKTCDVD is not set
-# CONFIG_ATA_OVER_ETH is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_ICS932S401 is not set
-# CONFIG_ENCLOSURE_SERVICES is not set
-# CONFIG_C2PORT is not set
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-# CONFIG_EEPROM_LEGACY is not set
-# CONFIG_EEPROM_93CX6 is not set
-CONFIG_HAVE_IDE=y
-# CONFIG_IDE is not set
-
-#
-# SCSI device support
-#
-# CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
-# CONFIG_SCSI_NETLINK is not set
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=y
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-CONFIG_SCSI_LOGGING...
[truncated message content] |
|
From: <jo...@us...> - 2009-06-03 22:30:02
|
Revision: 1323
http://armadeus.svn.sourceforge.net/armadeus/?rev=1323&view=rev
Author: jorasse
Date: 2009-06-03 22:29:56 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
[BUILDROOT] UBISF prepared to support versioning
Modified Paths:
--------------
trunk/patches/076-buildroot-ubifs.diff
Modified: trunk/patches/076-buildroot-ubifs.diff
===================================================================
--- trunk/patches/076-buildroot-ubifs.diff 2009-06-03 14:40:45 UTC (rev 1322)
+++ trunk/patches/076-buildroot-ubifs.diff 2009-06-03 22:29:56 UTC (rev 1323)
@@ -6,8 +6,8 @@
#MKFS_UBIFS_URL=http://git.infradead.org/users/dedekind/mkfs.ubifs.git?a=snapshot;h=$(MKFS_UBIFS_VERSION);sf=tgz
-MKFS_UBIFS_VERSION=v0.4
-MKFS_UBIFS_URL=http://git.infradead.org/users/dedekind/mkfs.ubifs.git?a=snapshot;h=refs/tags/mkfs.ubifs-$(MKFS_UBIFS_VERSION);sf=tgz
-+MKFS_UBIFS_VERSION=head
-+MKFS_UBIFS_URL=http://git.infradead.org/users/ahunter/mkfs.ubifs.git?a=snapshot;sf=tgz
++MKFS_UBIFS_VERSION=HEAD
++MKFS_UBIFS_URL=http://git.infradead.org/users/ahunter/mkfs.ubifs.git?a=snapshot;h=$(MKFS_UBIFS_VERSION);sf=tgz
MKFS_UBIFS_SOURCE:=mkfs.ubifs-$(MKFS_UBIFS_VERSION).tar.gz
MKFS_UBIFS_DIR:= $(BUILD_DIR)/mkfs-ubifs-$(MKFS_UBIFS_VERSION)
MKFS_UBIFS_CAT:=$(ZCAT)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-03 14:40:48
|
Revision: 1322
http://armadeus.svn.sourceforge.net/armadeus/?rev=1322&view=rev
Author: artemys
Date: 2009-06-03 14:40:45 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
[BUILDROOT] Buildroot doesn't like symlinks for Linux default configs :-(
Removed Paths:
-------------
trunk/buildroot/local/apf27_test/linux-2.6.29.4.config
trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config
trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.4.config
trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.4.config
Deleted: trunk/buildroot/local/apf27_test/linux-2.6.29.4.config
===================================================================
--- trunk/buildroot/local/apf27_test/linux-2.6.29.4.config 2009-06-03 09:15:31 UTC (rev 1321)
+++ trunk/buildroot/local/apf27_test/linux-2.6.29.4.config 2009-06-03 14:40:45 UTC (rev 1322)
@@ -1 +0,0 @@
-link linux-2.6.29.config
\ No newline at end of file
Deleted: trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config
===================================================================
--- trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config 2009-06-03 09:15:31 UTC (rev 1321)
+++ trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config 2009-06-03 14:40:45 UTC (rev 1322)
@@ -1 +0,0 @@
-link linux-2.6.29.config
\ No newline at end of file
Deleted: trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.4.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.4.config 2009-06-03 09:15:31 UTC (rev 1321)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.4.config 2009-06-03 14:40:45 UTC (rev 1322)
@@ -1 +0,0 @@
-link apf27-linux-2.6.29.config
\ No newline at end of file
Deleted: trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.4.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.4.config 2009-06-03 09:15:31 UTC (rev 1321)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.4.config 2009-06-03 14:40:45 UTC (rev 1322)
@@ -1 +0,0 @@
-link apf9328-linux-2.6.29.config
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-03 09:15:34
|
Revision: 1321
http://armadeus.svn.sourceforge.net/armadeus/?rev=1321&view=rev
Author: artemys
Date: 2009-06-03 09:15:31 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
[BUILDROOT] Makes libvorbis is installed correctly
Added Paths:
-----------
trunk/patches/077-buildroot-libvorbis-update_makefile_to_prevent_bad_library_installation.diff
Removed Paths:
-------------
trunk/patches/032-buildroot-vorbis-tremor-build-fix-for-buildroot-before-30102007.diff
Added: trunk/patches/077-buildroot-libvorbis-update_makefile_to_prevent_bad_library_installation.diff
===================================================================
--- trunk/patches/077-buildroot-libvorbis-update_makefile_to_prevent_bad_library_installation.diff (rev 0)
+++ trunk/patches/077-buildroot-libvorbis-update_makefile_to_prevent_bad_library_installation.diff 2009-06-03 09:15:31 UTC (rev 1321)
@@ -0,0 +1,74 @@
+
+libvorbis was badly installed (multiple copies of .so in /usr/lib/ instead of
+symlinks).
+This patch updates to the latest Buildroot state to correct that.
+This patch will have to be removed when updating to latest Buildroot release.
+
+Index: buildroot/package/audio/libvorbis/libvorbis.mk
+===================================================================
+--- buildroot.org/package/audio/libvorbis/libvorbis.mk 2009-06-03 10:36:05.000000000 +0200
++++ buildroot/package/audio/libvorbis/libvorbis.mk 2009-06-03 11:01:31.000000000 +0200
+@@ -6,57 +6,17 @@
+ LIBVORBIS_VERSION:=1.2.0
+ LIBVORBIS_SOURCE:=libvorbis-$(LIBVORBIS_VERSION).tar.gz
+ LIBVORBIS_SITE:=http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE)
+-LIBVORBIS_DIR:=$(BUILD_DIR)/libvorbis-$(LIBVORBIS_VERSION)
+-LIBVORBIS_BINARY:=libvorbis
+-LIBVORBIS_TARGET_BINARY:=usr/bin/libvorbis
+-LIBVORBIS_CAT:=$(ZCAT)
+
+-$(DL_DIR)/$(LIBVORBIS_SOURCE):
+- $(WGET) -P $(DL_DIR) $(LIBVORBIS_SITE)/$(LIBVORBIS_SOURCE)
++LIBVORBIS_AUTORECONF = NO
++LIBVORBIS_INSTALL_STAGING = YES
++LIBVORBIS_INSTALL_TARGET = YES
+
+-$(LIBVORBIS_DIR)/.source: $(DL_DIR)/$(LIBVORBIS_SOURCE)
+- $(LIBVORBIS_CAT) $(DL_DIR)/$(LIBVORBIS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+- touch $@
+-
+-$(LIBVORBIS_DIR)/.configured: $(LIBVORBIS_DIR)/.source
+- (cd $(LIBVORBIS_DIR); rm -rf config.cache; \
+- $(TARGET_CONFIGURE_ARGS) \
+- $(TARGET_CONFIGURE_OPTS) \
+- CFLAGS="$(TARGET_CFLAGS)" \
+- ./configure \
+- --target=$(GNU_TARGET_NAME) \
+- --host=$(GNU_TARGET_NAME) \
+- --build=$(GNU_HOST_NAME) \
+- --prefix=/usr \
+- --sysconfdir=/etc \
+- --enable-shared \
+- --enable-static \
+- --disable-oggtest \
+- $(DISABLE_NLS) \
+- )
+- touch $@
+-
+-$(LIBVORBIS_DIR)/.libs: $(LIBVORBIS_DIR)/.configured
+- $(MAKE) -C $(@D)
+- touch $@
+-
+-$(STAGING_DIR)/usr/lib/libvorbis.so: $(LIBVORBIS_DIR)/.libs
+- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBVORBIS_DIR) install
+-
+-$(TARGET_DIR)/usr/lib/libvorbis.so: $(STAGING_DIR)/usr/lib/libvorbis.so
+- $(INSTALL) -D $(STAGING_DIR)/usr/lib/libvorbis*.so* $(TARGET_DIR)/usr/lib
+- $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libvorbis*.so*
+-
+-libvorbis: uclibc pkgconfig libogg $(TARGET_DIR)/usr/lib/libvorbis.so
++LIBVORBIS_CONF_OPT = --disable-oggtest
+
+-libvorbis-source: $(DL_DIR)/$(LIBVORBIS_SOURCE)
++LIBVORBIS_DEPENDENCIES = uclibc pkgconfig libogg
+
+-libvorbis-clean:
+- $(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBVORBIS_DIR) uninstall
+- -$(MAKE) -C $(LIBVORBIS_DIR) clean
++$(eval $(call AUTOTARGETS,package/multimedia,libvorbis))
+
+-libvorbis-dirclean:
+- rm -rf $(LIBVORBIS_DIR)
+
+ ############################################################
+ #
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-03 07:31:38
|
Revision: 1320
http://armadeus.svn.sourceforge.net/armadeus/?rev=1320&view=rev
Author: artemys
Date: 2009-06-03 07:31:35 +0000 (Wed, 03 Jun 2009)
Log Message:
-----------
[BUILDROOT] Makes Linux 2.6.29.4 the default kernel for coming (soon) release + updates default configurations
Modified Paths:
--------------
trunk/buildroot/local/apf27_test/apf27_test.config
trunk/buildroot/local/apf27_test/busybox-1.12.1.config
trunk/buildroot/local/apf27_test/linux-2.6.29.config
trunk/buildroot/local/apf27_test/u-boot/apf27.h
trunk/buildroot/local/apf27_test/uclibc-0.9.29.config
trunk/buildroot/local/apf9328_test/apf9328_test.config
trunk/buildroot/local/apf9328_test/busybox-1.12.1.config
trunk/buildroot/local/apf9328_test/linux-2.6.29.config
trunk/buildroot/local/apf9328_test/u-boot/apf9328.h
trunk/buildroot/local/apf9328_test/uclibc-0.9.29.config
trunk/buildroot/target/device/armadeus/apf27/apf27_defconfig
trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
trunk/patches/074-buildroot-add_2_6_29_kernel_choice.diff
Added Paths:
-----------
trunk/buildroot/local/apf27_test/linux-2.6.29.4.config
trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config
trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.4.config
trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.4.config
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.4
Modified: trunk/buildroot/local/apf27_test/apf27_test.config
===================================================================
--- trunk/buildroot/local/apf27_test/apf27_test.config 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/local/apf27_test/apf27_test.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 2 12:38:18 2009
+# Wed Jun 3 08:56:03 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -884,11 +884,13 @@
# BR2_KERNEL_HURD is not set
BR2_PACKAGE_LINUX=y
BR2_PACKAGE_LINUX_FORMAT="uImage"
+BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
BR2_KERNEL_CURRENT_VERSION="2.6.26.3"
BR2_KERNEL_THIS_VERSION="2.6.29"
BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
+BR2_KERNEL_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
# BR2_LINUX_2_6_STABLE is not set
BR2_LINUX_2_6_29=y
# BR2_LINUX_2_6_28 is not set
@@ -910,13 +912,26 @@
#
# Patches
#
-# BR2_KERNEL_ADD_KERNEL_ORG_PATCH is not set
+BR2_KERNEL_ADD_KERNEL_ORG_PATCH=y
+# BR2_KERNEL_ADD_LATEST is not set
+# BR2_KERNEL_ADD_LATEST_MINORPATCH is not set
+BR2_KERNEL_ADD_MINORPATCH=y
+# BR2_KERNEL_ADD_LATEST_RC_PATCH is not set
+# BR2_KERNEL_ADD_RC_PATCH is not set
+# BR2_KERNEL_ADD_LATEST_SNAPSHOT is not set
+# BR2_KERNEL_ADD_SNAPSHOT is not set
+# BR2_KERNEL_ADD_LATEST_MM_PATCH is not set
+# BR2_KERNEL_ADD_MM_PATCH is not set
+BR2_KERNEL_ADD_PATCH=y
+BR2_KERNEL_MINORLEVEL="4"
# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
BR2_LINUX_BOARD_PATCH=y
BR2_LINUX_BSP_PATCH=""
+BR2_KERNEL_PATCH="patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2"
+BR2_EXTRA_VERSION=".$(BR2_KERNEL_PATCH_LEVEL)"
BR2_KERNEL_BASE=y
BR2_DOWNLOAD_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
-BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
+BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)"
#
# Linux Kernel Configuration
@@ -940,7 +955,7 @@
# BR2_LINUX_COPYTO_TFTPBOOT is not set
BR2_LINUX_COPYTO=""
# BR2_LINUX_COPY_CONFIGURATION is not set
-BR2_PACKAGE_LINUX_KCONFIG=".//local/apf27_test/linux-2.6.29.config"
+BR2_PACKAGE_LINUX_KCONFIG=".//local/apf27_test/linux-2.6.29.4.config"
BR2_PACKAGE_BUSYBOX_CONFIG=".//local/apf27_test/busybox-1.12.1.config"
BR2_UCLIBC_CONFIG=".//local/apf27_test/uclibc-0.9.29.config"
BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE=".//local/apf27_test/u-boot/apf27.h"
Modified: trunk/buildroot/local/apf27_test/busybox-1.12.1.config
===================================================================
--- trunk/buildroot/local/apf27_test/busybox-1.12.1.config 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/local/apf27_test/busybox-1.12.1.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.12.1
-# Tue May 12 22:44:00 2009
+# Tue Jun 2 13:28:40 2009
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -71,7 +71,7 @@
# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus_trunk_work_2_6_29/buildroot/project_build_armv5te/apf27_test/root"
+CONFIG_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus_test_release/buildroot/project_build_armv5te/apf27_test/root"
#
# Busybox Library Tuning
Added: trunk/buildroot/local/apf27_test/linux-2.6.29.4.config
===================================================================
--- trunk/buildroot/local/apf27_test/linux-2.6.29.4.config (rev 0)
+++ trunk/buildroot/local/apf27_test/linux-2.6.29.4.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -0,0 +1 @@
+link linux-2.6.29.config
\ No newline at end of file
Property changes on: trunk/buildroot/local/apf27_test/linux-2.6.29.4.config
___________________________________________________________________
Added: svn:special
+ *
Modified: trunk/buildroot/local/apf27_test/linux-2.6.29.config
===================================================================
--- trunk/buildroot/local/apf27_test/linux-2.6.29.config 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/local/apf27_test/linux-2.6.29.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29
-# Tue Jun 2 16:30:22 2009
+# Linux kernel version: 2.6.29.4
+# Wed Jun 3 09:02:33 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
Modified: trunk/buildroot/local/apf27_test/u-boot/apf27.h
===================================================================
--- trunk/buildroot/local/apf27_test/u-boot/apf27.h 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/local/apf27_test/u-boot/apf27.h 2009-06-03 07:31:35 UTC (rev 1320)
@@ -918,3 +918,16 @@
#endif
#define CONFIG_BOARD_NAME apf27
#endif /* __BR2_ADDED_CONFIG_H */
+
+/* Add a wrapper around the values Buildroot sets. */
+#ifndef __BR2_ADDED_CONFIG_H
+#define __BR2_ADDED_CONFIG_H
+#ifdef CONFIG_HOSTNAME
+#undef CONFIG_HOSTNAME
+#endif
+#define CONFIG_HOSTNAME "apf27_test"
+#ifdef CONFIG_BOARD_NAME
+#undef CONFIG_BOARD_NAME
+#endif
+#define CONFIG_BOARD_NAME apf27
+#endif /* __BR2_ADDED_CONFIG_H */
Modified: trunk/buildroot/local/apf27_test/uclibc-0.9.29.config
===================================================================
--- trunk/buildroot/local/apf27_test/uclibc-0.9.29.config 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/local/apf27_test/uclibc-0.9.29.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Sun Mar 29 20:58:29 2009
+# Tue Jun 2 12:39:28 2009
#
# TARGET_alpha is not set
TARGET_arm=y
@@ -64,7 +64,7 @@
# UCLIBC_HAS_FPU is not set
UCLIBC_HAS_SOFT_FLOAT=y
DO_C99_MATH=y
-KERNEL_HEADERS="/home/julien/workspace/Armadeus_SF/armadeus_trunk_work_2_6_29/buildroot/toolchain_build_armv5te/linux/include"
+KERNEL_HEADERS="/home/julien/workspace/Armadeus_SF/armadeus_test_release/buildroot/toolchain_build_armv5te/linux/include"
HAVE_DOT_CONFIG=y
#
@@ -197,7 +197,7 @@
#
# uClibc development/debugging options
#
-CROSS_COMPILER_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus_trunk_work_2_6_29/buildroot/build_armv5te/staging_dir/usr/bin/arm-linux-uclibc-"
+CROSS_COMPILER_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus_test_release/buildroot/build_armv5te/staging_dir/usr/bin/arm-linux-uclibc-"
UCLIBC_EXTRA_CFLAGS=""
# DODEBUG is not set
# DODEBUG_PT is not set
Modified: trunk/buildroot/local/apf9328_test/apf9328_test.config
===================================================================
--- trunk/buildroot/local/apf9328_test/apf9328_test.config 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/local/apf9328_test/apf9328_test.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Jun 2 12:38:18 2009
+# Tue Jun 2 21:25:34 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -825,11 +825,13 @@
# BR2_KERNEL_HURD is not set
BR2_PACKAGE_LINUX=y
BR2_PACKAGE_LINUX_FORMAT="uImage"
+BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
BR2_KERNEL_CURRENT_VERSION="2.6.26.3"
BR2_KERNEL_THIS_VERSION="2.6.29"
BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
+BR2_KERNEL_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
# BR2_LINUX_2_6_STABLE is not set
BR2_LINUX_2_6_29=y
# BR2_LINUX_2_6_28 is not set
@@ -851,13 +853,26 @@
#
# Patches
#
-# BR2_KERNEL_ADD_KERNEL_ORG_PATCH is not set
+BR2_KERNEL_ADD_KERNEL_ORG_PATCH=y
+# BR2_KERNEL_ADD_LATEST is not set
+# BR2_KERNEL_ADD_LATEST_MINORPATCH is not set
+BR2_KERNEL_ADD_MINORPATCH=y
+# BR2_KERNEL_ADD_LATEST_RC_PATCH is not set
+# BR2_KERNEL_ADD_RC_PATCH is not set
+# BR2_KERNEL_ADD_LATEST_SNAPSHOT is not set
+# BR2_KERNEL_ADD_SNAPSHOT is not set
+# BR2_KERNEL_ADD_LATEST_MM_PATCH is not set
+# BR2_KERNEL_ADD_MM_PATCH is not set
+BR2_KERNEL_ADD_PATCH=y
+BR2_KERNEL_MINORLEVEL="4"
# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
BR2_LINUX_BOARD_PATCH=y
BR2_LINUX_BSP_PATCH=""
+BR2_KERNEL_PATCH="patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2"
+BR2_EXTRA_VERSION=".$(BR2_KERNEL_PATCH_LEVEL)"
BR2_KERNEL_BASE=y
BR2_DOWNLOAD_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
-BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
+BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION).$(BR2_KERNEL_PATCH_LEVEL)"
#
# Linux Kernel Configuration
@@ -881,7 +896,7 @@
# BR2_LINUX_COPYTO_TFTPBOOT is not set
BR2_LINUX_COPYTO=""
# BR2_LINUX_COPY_CONFIGURATION is not set
-BR2_PACKAGE_LINUX_KCONFIG=".//local/apf9328_test/linux-2.6.29.config"
+BR2_PACKAGE_LINUX_KCONFIG=".//local/apf9328_test/linux-2.6.29.4.config"
BR2_PACKAGE_BUSYBOX_CONFIG=".//local/apf9328_test/busybox-1.12.1.config"
BR2_UCLIBC_CONFIG=".//local/apf9328_test/uclibc-0.9.29.config"
BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE=".//local/apf9328_test/u-boot/apf9328.h"
Modified: trunk/buildroot/local/apf9328_test/busybox-1.12.1.config
===================================================================
--- trunk/buildroot/local/apf9328_test/busybox-1.12.1.config 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/local/apf9328_test/busybox-1.12.1.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.12.1
-# Tue May 5 15:38:53 2009
+# Tue Jun 2 18:13:49 2009
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -71,7 +71,7 @@
# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus_trunk_work_2_6_29/buildroot/project_build_armv4t/apf9328_test/root"
+CONFIG_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus_test_release/buildroot/project_build_armv4t/apf9328_test/root"
#
# Busybox Library Tuning
Added: trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config
===================================================================
--- trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config (rev 0)
+++ trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -0,0 +1 @@
+link linux-2.6.29.config
\ No newline at end of file
Property changes on: trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config
___________________________________________________________________
Added: svn:special
+ *
Modified: trunk/buildroot/local/apf9328_test/linux-2.6.29.config
===================================================================
--- trunk/buildroot/local/apf9328_test/linux-2.6.29.config 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/local/apf9328_test/linux-2.6.29.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29
-# Wed May 6 14:19:39 2009
+# Linux kernel version: 2.6.29.4
+# Tue Jun 2 21:33:46 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
Modified: trunk/buildroot/local/apf9328_test/u-boot/apf9328.h
===================================================================
--- trunk/buildroot/local/apf9328_test/u-boot/apf9328.h 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/local/apf9328_test/u-boot/apf9328.h 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1016,3 +1016,16 @@
#endif
#define CONFIG_BOARD_NAME apf9328
#endif /* __BR2_ADDED_CONFIG_H */
+
+/* Add a wrapper around the values Buildroot sets. */
+#ifndef __BR2_ADDED_CONFIG_H
+#define __BR2_ADDED_CONFIG_H
+#ifdef CONFIG_HOSTNAME
+#undef CONFIG_HOSTNAME
+#endif
+#define CONFIG_HOSTNAME "apf9328_test"
+#ifdef CONFIG_BOARD_NAME
+#undef CONFIG_BOARD_NAME
+#endif
+#define CONFIG_BOARD_NAME apf9328
+#endif /* __BR2_ADDED_CONFIG_H */
Modified: trunk/buildroot/local/apf9328_test/uclibc-0.9.29.config
===================================================================
--- trunk/buildroot/local/apf9328_test/uclibc-0.9.29.config 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/local/apf9328_test/uclibc-0.9.29.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue Apr 14 19:43:04 2009
+# Tue Jun 2 17:35:00 2009
#
# TARGET_alpha is not set
TARGET_arm=y
@@ -65,7 +65,7 @@
# UCLIBC_HAS_FPU is not set
UCLIBC_HAS_SOFT_FLOAT=y
DO_C99_MATH=y
-KERNEL_HEADERS="/home/julien/workspace/Armadeus_SF/armadeus_trunk_work_2_6_29/buildroot/toolchain_build_armv4t/linux/include"
+KERNEL_HEADERS="/home/julien/workspace/Armadeus_SF/armadeus_test_release/buildroot/toolchain_build_armv4t/linux/include"
HAVE_DOT_CONFIG=y
#
@@ -198,7 +198,7 @@
#
# uClibc development/debugging options
#
-CROSS_COMPILER_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus_trunk_work_2_6_29/buildroot/build_armv4t/staging_dir/usr/bin/arm-linux-uclibc-"
+CROSS_COMPILER_PREFIX="/home/julien/workspace/Armadeus_SF/armadeus_test_release/buildroot/build_armv4t/staging_dir/usr/bin/arm-linux-uclibc-"
UCLIBC_EXTRA_CFLAGS=""
# DODEBUG is not set
# DODEBUG_PT is not set
Added: trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.4.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.4.config (rev 0)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.4.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -0,0 +1 @@
+link apf27-linux-2.6.29.config
\ No newline at end of file
Property changes on: trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.4.config
___________________________________________________________________
Added: svn:special
+ *
Modified: trunk/buildroot/target/device/armadeus/apf27/apf27_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27_defconfig 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27_defconfig 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Sat May 16 19:10:45 2009
+# Wed Jun 3 09:18:49 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -771,16 +771,15 @@
BR2_PACKAGE_LINUX_FORMAT="uImage"
BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
BR2_KERNEL_CURRENT_VERSION="2.6.26.3"
-BR2_KERNEL_NEXT_VERSION="2.6.28"
-BR2_KERNEL_THIS_VERSION="2.6.27"
+BR2_KERNEL_THIS_VERSION="2.6.29"
BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
BR2_KERNEL_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
# BR2_LINUX_2_6_STABLE is not set
-# BR2_LINUX_2_6_29 is not set
+BR2_LINUX_2_6_29=y
# BR2_LINUX_2_6_28 is not set
-BR2_LINUX_2_6_27=y
+# BR2_LINUX_2_6_27 is not set
# BR2_LINUX_2_6_26 is not set
# BR2_LINUX_2_6_25 is not set
# BR2_LINUX_2_6_24 is not set
@@ -809,7 +808,7 @@
# BR2_KERNEL_ADD_LATEST_MM_PATCH is not set
# BR2_KERNEL_ADD_MM_PATCH is not set
BR2_KERNEL_ADD_PATCH=y
-BR2_KERNEL_MINORLEVEL="13"
+BR2_KERNEL_MINORLEVEL="4"
# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
BR2_LINUX_BOARD_PATCH=y
BR2_LINUX_BSP_PATCH=""
Added: trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.4.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.4.config (rev 0)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.4.config 2009-06-03 07:31:35 UTC (rev 1320)
@@ -0,0 +1 @@
+link apf9328-linux-2.6.29.config
\ No newline at end of file
Property changes on: trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.4.config
___________________________________________________________________
Added: svn:special
+ *
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328_defconfig 2009-06-03 07:31:35 UTC (rev 1320)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Sat May 16 18:12:03 2009
+# Wed Jun 3 09:20:00 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -767,16 +767,15 @@
BR2_PACKAGE_LINUX_FORMAT="uImage"
BR2_KERNEL_PATCH_LEVEL="$(BR2_KERNEL_MINORLEVEL)"
BR2_KERNEL_CURRENT_VERSION="2.6.26.3"
-BR2_KERNEL_NEXT_VERSION="2.6.28"
-BR2_KERNEL_THIS_VERSION="2.6.27"
+BR2_KERNEL_THIS_VERSION="2.6.29"
BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
BR2_KERNEL_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
# BR2_LINUX_2_6_STABLE is not set
-# BR2_LINUX_2_6_29 is not set
+BR2_LINUX_2_6_29=y
# BR2_LINUX_2_6_28 is not set
-BR2_LINUX_2_6_27=y
+# BR2_LINUX_2_6_27 is not set
# BR2_LINUX_2_6_26 is not set
# BR2_LINUX_2_6_25 is not set
# BR2_LINUX_2_6_24 is not set
@@ -805,7 +804,7 @@
# BR2_KERNEL_ADD_LATEST_MM_PATCH is not set
# BR2_KERNEL_ADD_MM_PATCH is not set
BR2_KERNEL_ADD_PATCH=y
-BR2_KERNEL_MINORLEVEL="13"
+BR2_KERNEL_MINORLEVEL="4"
# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
BR2_LINUX_BOARD_PATCH=y
BR2_LINUX_BSP_PATCH=""
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.4
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.4 (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.4 2009-06-03 07:31:35 UTC (rev 1320)
@@ -0,0 +1 @@
+link 2.6.29
\ No newline at end of file
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29.4
___________________________________________________________________
Added: svn:special
+ *
Modified: trunk/patches/074-buildroot-add_2_6_29_kernel_choice.diff
===================================================================
--- trunk/patches/074-buildroot-add_2_6_29_kernel_choice.diff 2009-06-02 21:51:11 UTC (rev 1319)
+++ trunk/patches/074-buildroot-add_2_6_29_kernel_choice.diff 2009-06-03 07:31:35 UTC (rev 1320)
@@ -25,7 +25,7 @@
Linux 2.6.26.3
+config BR2_LINUX_2_6_29
-+ bool "Linux 2.6.29 (experimental)"
++ bool "Linux 2.6.29"
+ select BR2_KERNEL_BASE
+ help
+ Linux 2.6.29
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-06-02 21:51:14
|
Revision: 1319
http://armadeus.svn.sourceforge.net/armadeus/?rev=1319&view=rev
Author: jorasse
Date: 2009-06-02 21:51:11 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
[BUILDROOT] UBISF preliminary support (requires host package uuid-dev "debian")
Added Paths:
-----------
trunk/patches/076-buildroot-ubifs.diff
Added: trunk/patches/076-buildroot-ubifs.diff
===================================================================
--- trunk/patches/076-buildroot-ubifs.diff (rev 0)
+++ trunk/patches/076-buildroot-ubifs.diff 2009-06-02 21:51:11 UTC (rev 1319)
@@ -0,0 +1,13 @@
+--- buildrootref/target/ubifs/ubifsroot.mk 2008-11-03 00:15:09.000000000 -0800
++++ buildroot/target/ubifs/ubifsroot.mk 2009-06-02 14:39:18.000000000 -0700
+@@ -5,8 +5,8 @@
+ #############################################################
+ #MKFS_UBIFS_VERSION=2582f128dad78591bc3adcc87c343c690bb82e61
+ #MKFS_UBIFS_URL=http://git.infradead.org/users/dedekind/mkfs.ubifs.git?a=snapshot;h=$(MKFS_UBIFS_VERSION);sf=tgz
+-MKFS_UBIFS_VERSION=v0.4
+-MKFS_UBIFS_URL=http://git.infradead.org/users/dedekind/mkfs.ubifs.git?a=snapshot;h=refs/tags/mkfs.ubifs-$(MKFS_UBIFS_VERSION);sf=tgz
++MKFS_UBIFS_VERSION=head
++MKFS_UBIFS_URL=http://git.infradead.org/users/ahunter/mkfs.ubifs.git?a=snapshot;sf=tgz
+ MKFS_UBIFS_SOURCE:=mkfs.ubifs-$(MKFS_UBIFS_VERSION).tar.gz
+ MKFS_UBIFS_DIR:= $(BUILD_DIR)/mkfs-ubifs-$(MKFS_UBIFS_VERSION)
+ MKFS_UBIFS_CAT:=$(ZCAT)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-02 15:11:18
|
Revision: 1318
http://armadeus.svn.sourceforge.net/armadeus/?rev=1318&view=rev
Author: artemys
Date: 2009-06-02 15:11:05 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
[TEST] Add OSS support in APF27's Linux (Doom needs it for sound)
Modified Paths:
--------------
trunk/buildroot/local/apf27_test/linux-2.6.29.config
Modified: trunk/buildroot/local/apf27_test/linux-2.6.29.config
===================================================================
--- trunk/buildroot/local/apf27_test/linux-2.6.29.config 2009-06-02 15:08:18 UTC (rev 1317)
+++ trunk/buildroot/local/apf27_test/linux-2.6.29.config 2009-06-02 15:11:05 UTC (rev 1318)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29
-# Tue Jun 2 15:41:01 2009
+# Tue Jun 2 16:30:22 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1142,13 +1142,15 @@
CONFIG_LOGO_LINUX_CLUT224=y
# CONFIG_LOGO_ARMADEUS_CLUT224 is not set
CONFIG_SOUND=m
-# CONFIG_SOUND_OSS_CORE is not set
+CONFIG_SOUND_OSS_CORE=y
CONFIG_SND=m
CONFIG_SND_TIMER=m
CONFIG_SND_PCM=m
# CONFIG_SND_SEQUENCER is not set
-# CONFIG_SND_MIXER_OSS is not set
-# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_HRTIMER is not set
# CONFIG_SND_DYNAMIC_MINORS is not set
CONFIG_SND_SUPPORT_OLD_API=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-02 15:08:20
|
Revision: 1317
http://armadeus.svn.sourceforge.net/armadeus/?rev=1317&view=rev
Author: artemys
Date: 2009-06-02 15:08:18 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
[TEST] Add fbtest by default in test configs
Modified Paths:
--------------
trunk/buildroot/local/apf27_test/apf27_test.config
trunk/buildroot/local/apf9328_test/apf9328_test.config
Modified: trunk/buildroot/local/apf27_test/apf27_test.config
===================================================================
--- trunk/buildroot/local/apf27_test/apf27_test.config 2009-06-02 14:22:01 UTC (rev 1316)
+++ trunk/buildroot/local/apf27_test/apf27_test.config 2009-06-02 15:08:18 UTC (rev 1317)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue May 12 22:40:43 2009
+# Tue Jun 2 12:38:18 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -325,6 +325,17 @@
# BR2_PACKAGE_PCRE is not set
#
+# Armadeus specific packages
+#
+# BR2_PACKAGE_LIBDNET is not set
+# BR2_PACKAGE_MESALIB is not set
+BR2_PACKAGE_FBTEST=y
+# BR2_PACKAGE_IMXSSI is not set
+# BR2_PACKAGE_GPM is not set
+# BR2_PACKAGE_DUMMY is not set
+# BR2_PACKAGE_SNES9X is not set
+
+#
# Other stuff
#
# BR2_PACKAGE_AT is not set
Modified: trunk/buildroot/local/apf9328_test/apf9328_test.config
===================================================================
--- trunk/buildroot/local/apf9328_test/apf9328_test.config 2009-06-02 14:22:01 UTC (rev 1316)
+++ trunk/buildroot/local/apf9328_test/apf9328_test.config 2009-06-02 15:08:18 UTC (rev 1317)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Tue May 5 15:35:03 2009
+# Tue Jun 2 12:38:18 2009
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -321,6 +321,17 @@
# BR2_PACKAGE_PCRE is not set
#
+# Armadeus specific packages
+#
+# BR2_PACKAGE_LIBDNET is not set
+# BR2_PACKAGE_MESALIB is not set
+BR2_PACKAGE_FBTEST=y
+# BR2_PACKAGE_IMXSSI is not set
+# BR2_PACKAGE_GPM is not set
+# BR2_PACKAGE_DUMMY is not set
+# BR2_PACKAGE_SNES9X is not set
+
+#
# Other stuff
#
# BR2_PACKAGE_AT is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-02 14:22:15
|
Revision: 1316
http://armadeus.svn.sourceforge.net/armadeus/?rev=1316&view=rev
Author: artemys
Date: 2009-06-02 14:22:01 +0000 (Tue, 02 Jun 2009)
Log Message:
-----------
[LINUX] Makes inkernel (i.MXL) framebuffer driver the default one for APF27, starting from 2.6.29. Freescale one is kept as an option until inkernel one supports graphic window.
Modified Paths:
--------------
trunk/buildroot/local/apf27_test/linux-2.6.29.config
trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
Modified: trunk/buildroot/local/apf27_test/linux-2.6.29.config
===================================================================
--- trunk/buildroot/local/apf27_test/linux-2.6.29.config 2009-06-01 23:00:33 UTC (rev 1315)
+++ trunk/buildroot/local/apf27_test/linux-2.6.29.config 2009-06-02 14:22:01 UTC (rev 1316)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29
-# Wed May 13 09:02:28 2009
+# Tue Jun 2 15:41:01 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1091,18 +1091,13 @@
#
# Frame buffer hardware drivers
#
+CONFIG_FB_IMX=y
CONFIG_FB_IMX_SHARP_LQ043_TFT=y
# CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT is not set
# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
# CONFIG_FB_IMX_MOTOROLA_A910_TFT is not set
-CONFIG_FB_MXC=y
-
-#
-# MXC framebuffer options
-#
-CONFIG_FB_MXC_SYNC_PANEL=y
-# CONFIG_FB_MXC_OVERLAY is not set
+# CONFIG_FB_MXC is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
Modified: trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config 2009-06-01 23:00:33 UTC (rev 1315)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config 2009-06-02 14:22:01 UTC (rev 1316)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29
-# Wed May 27 19:47:22 2009
+# Tue Jun 2 15:41:01 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1068,7 +1068,7 @@
# Graphics support
#
# CONFIG_VGASTATE is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_DDC is not set
@@ -1091,19 +1091,13 @@
#
# Frame buffer hardware drivers
#
-# CONFIG_FB_IMX is not set
+CONFIG_FB_IMX=y
CONFIG_FB_IMX_SHARP_LQ043_TFT=y
# CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT is not set
# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
# CONFIG_FB_IMX_MOTOROLA_A910_TFT is not set
-CONFIG_FB_MXC=y
-
-#
-# MXC framebuffer options
-#
-CONFIG_FB_MXC_SYNC_PANEL=y
-# CONFIG_FB_MXC_OVERLAY is not set
+# CONFIG_FB_MXC is not set
# CONFIG_FB_S1D13XXX is not set
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch 2009-06-01 23:00:33 UTC (rev 1315)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch 2009-06-02 14:22:01 UTC (rev 1316)
@@ -4,8 +4,8 @@
Index: linux-2.6.29/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29/arch/arm/mach-mx2/apf27.c 2009-05-27 15:46:04.000000000 +0200
-@@ -0,0 +1,1571 @@
++++ linux-2.6.29/arch/arm/mach-mx2/apf27.c 2009-06-02 15:40:48.000000000 +0200
+@@ -0,0 +1,1572 @@
+ /*
+ * apf27.c
+ *
@@ -58,6 +58,7 @@
+#include <mach/mmc.h>
+#ifdef CONFIG_FB_MXC
+#include <mach/imx_fb.h>
++#include <mach/imxfb.h>
+#endif
+#include <mach/mxc_nand.h>
+#include <mach/mxc_ehci.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-06-01 23:00:41
|
Revision: 1315
http://armadeus.svn.sourceforge.net/armadeus/?rev=1315&view=rev
Author: jorasse
Date: 2009-06-01 23:00:33 +0000 (Mon, 01 Jun 2009)
Log Message:
-----------
[BULD] prepare to support git SCM.
Modified Paths:
--------------
trunk/Makefile
trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk
trunk/buildroot/target/device/armadeus/linux/kernel-patches/copy_patches.sh
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-06-01 21:17:21 UTC (rev 1314)
+++ trunk/Makefile 2009-06-01 23:00:33 UTC (rev 1315)
@@ -36,7 +36,7 @@
export ARMADEUS_TOPDIR
PATCH_DIR=patches
-TAR_OPTIONS=--exclude=.svn -xf
+TAR_OPTIONS=--exclude=.svn --exclude=.git -xf
ARMADEUS_ENV_FILE=armadeus_env.sh
@@ -93,7 +93,7 @@
$(BUILDROOT_DIR)/.unpacked: $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) $(PATCH_DIR)/*.diff
bzcat $(BUILDROOT_FILE_PATH)/$(BUILDROOT_SOURCE) | \
- tar --exclude=.svn -C $(BUILDROOT_DIR)/.. $(TAR_OPTIONS) -
+ tar -C $(BUILDROOT_DIR)/.. $(TAR_OPTIONS) -
$(BUILDROOT_DIR)/toolchain/patch-kernel.sh $(BUILDROOT_DIR) $(PATCH_DIR) \*.diff
# Since patches may add/delete packages, we process extra packages after patching
perl $(PATCH_DIR)/add_packages_config_entry.pl buildroot=$(BUILDROOT_DIR)
Modified: trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk
===================================================================
--- trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk 2009-06-01 21:17:21 UTC (rev 1314)
+++ trunk/buildroot/package/armadeus-testsuite/armadeus-tests.mk 2009-06-01 23:00:33 UTC (rev 1315)
@@ -14,7 +14,7 @@
$(ARMADEUS-TESTSUITE_DIR)/.unpacked:
mkdir -p $(ARMADEUS-TESTSUITE_DIR)/
- cd $(ARMADEUS-TESTSUITE_SOURCE); tar ch --exclude=.svn . | tar x -C $(ARMADEUS-TESTSUITE_DIR)/
+ cd $(ARMADEUS-TESTSUITE_SOURCE); tar ch --exclude=.svn --exclude=.git . | tar x -C $(ARMADEUS-TESTSUITE_DIR)/
touch $@
$(ARMADEUS-TESTSUITE_TARGET_BINARY): $(ARMADEUS-TESTSUITE_DIR)/.unpacked
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/copy_patches.sh
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/copy_patches.sh 2009-06-01 21:17:21 UTC (rev 1314)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/copy_patches.sh 2009-06-01 23:00:33 UTC (rev 1315)
@@ -34,6 +34,7 @@
mv $2/$patches $2/$new_name
done
rm -rf $2/.svn
+rm -rf $2/.git
# Bye bye
exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-01 21:17:25
|
Revision: 1314
http://armadeus.svn.sourceforge.net/armadeus/?rev=1314&view=rev
Author: artemys
Date: 2009-06-01 21:17:21 +0000 (Mon, 01 Jun 2009)
Log Message:
-----------
[LINUX] Final corrections to have Doom working again (most important: color regs where bad on i.MX27 in mainline driver)
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/336-armadeus-imxfb-makes_it_compatible_with_arch_imx.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch 2009-06-01 10:10:53 UTC (rev 1313)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch 2009-06-01 21:17:21 UTC (rev 1314)
@@ -1,44 +0,0 @@
-PWMR, LSCR1 and DMACR registers only need to be initialized once at startup,
-not every time imxfb_set_par()/imxfb_activate_var() are called (for example
-when using SDL).
-Setting these registers in imxfb_set_par()/imxfb_activate_var() has the side
-effect (for example) of shutting down the backlight when opening an 8bits
-SDL screen.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.29/drivers/video/imxfb.c
-===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:52:35.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 09:14:31.000000000 +0200
-@@ -466,6 +466,7 @@
- pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
- var->yres, var->vsync_len,
- var->upper_margin, var->lower_margin);
-+ pr_debug("var: bpp=%d\n", var->bits_per_pixel);
-
- #if DEBUG_VAR
- if (var->xres < 16 || var->xres > 1024)
-@@ -523,9 +524,6 @@
- pcr |= fbi->pcr & ~0x3F;
-
- writel(pcr, fbi->regs + LCDC_PCR);
-- writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
-- writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
-- writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
-
- return 0;
- }
-@@ -719,6 +717,12 @@
- goto failed_cmap;
-
- imxfb_set_par(info);
-+ /* JB: The following parameters are only needed once at startup and so
-+ removed from from imxfb_set_par()/imxfb_activate_var() */
-+ writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
-+ writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
-+ writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
-+
- ret = register_framebuffer(info);
- if (ret < 0) {
- dev_err(&pdev->dev, "failed to register framebuffer\n");
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-makes_setpalettereg_compatible_with_mx27.patch 2009-06-01 21:17:21 UTC (rev 1314)
@@ -0,0 +1,30 @@
+
+On i.MX2(1/7) color palette registers are 18 bits wide for TFT display's modes.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-06-01 14:39:03.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-06-01 15:49:54.000000000 +0200
+@@ -221,12 +221,17 @@
+ {
+ struct imxfb_info *fbi = info->par;
+ u_int val, ret = 1;
++ unsigned int reg_size = 4;
+
+ #define CNVT_TOHW(val,width) ((((val)<<(width))+0x7FFF-(val))>>16)
+ if (regno < fbi->palette_size) {
+- val = (CNVT_TOHW(red, 4) << 8) |
+- (CNVT_TOHW(green,4) << 4) |
+- CNVT_TOHW(blue, 4);
++#ifdef CONFIG_ARCH_MX2
++ if (fbi->pcr & PCR_TFT)
++ reg_size = 6;
++#endif
++ val = (CNVT_TOHW(red, reg_size) << (reg_size * 2)) |
++ (CNVT_TOHW(green, reg_size) << reg_size) |
++ CNVT_TOHW(blue, reg_size);
+
+ writel(val, fbi->regs + 0x800 + (regno << 2));
+ ret = 0;
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch (from rev 1311, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-improvements.patch 2009-06-01 21:17:21 UTC (rev 1314)
@@ -0,0 +1,44 @@
+PWMR, LSCR1 and DMACR registers only need to be initialized once at startup,
+not every time imxfb_set_par()/imxfb_activate_var() are called (for example
+when using SDL).
+Setting these registers in imxfb_set_par()/imxfb_activate_var() has the side
+effect (for example) of shutting down the backlight when opening an 8bits
+SDL screen.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:52:35.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 09:14:31.000000000 +0200
+@@ -466,6 +466,7 @@
+ pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
+ var->yres, var->vsync_len,
+ var->upper_margin, var->lower_margin);
++ pr_debug("var: bpp=%d\n", var->bits_per_pixel);
+
+ #if DEBUG_VAR
+ if (var->xres < 16 || var->xres > 1024)
+@@ -523,9 +524,6 @@
+ pcr |= fbi->pcr & ~0x3F;
+
+ writel(pcr, fbi->regs + LCDC_PCR);
+- writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
+- writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
+- writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
+
+ return 0;
+ }
+@@ -719,6 +717,12 @@
+ goto failed_cmap;
+
+ imxfb_set_par(info);
++ /* JB: The following parameters are only needed once at startup and so
++ removed from from imxfb_set_par()/imxfb_activate_var() */
++ writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
++ writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
++ writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
++
+ ret = register_framebuffer(info);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "failed to register framebuffer\n");
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/336-armadeus-imxfb-makes_it_compatible_with_arch_imx.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/336-armadeus-imxfb-makes_it_compatible_with_arch_imx.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/336-armadeus-imxfb-makes_it_compatible_with_arch_imx.patch 2009-06-01 21:17:21 UTC (rev 1314)
@@ -0,0 +1,19 @@
+
+To be removed when ARCH_MX1 is fully merged and ARCH_IMX is dead.
+
+
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-06-01 17:12:03.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-06-01 17:12:58.000000000 +0200
+@@ -35,6 +35,10 @@
+
+ #include <mach/imxfb.h>
+
++#ifdef CONFIG_ARCH_IMX
++#define CONFIG_ARCH_MX1
++#endif
++
+ /*
+ * Complain if VAR is out of range.
+ */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-06-01 10:10:56
|
Revision: 1313
http://armadeus.svn.sourceforge.net/armadeus/?rev=1313&view=rev
Author: artemys
Date: 2009-06-01 10:10:53 +0000 (Mon, 01 Jun 2009)
Log Message:
-----------
[DEMOS] Add SDL music player (thanks Rebouxan)
Added Paths:
-----------
trunk/target/demos/music_player/
trunk/target/demos/music_player/Makefile
trunk/target/demos/music_player/README
trunk/target/demos/music_player/S60mp
trunk/target/demos/music_player/data/
trunk/target/demos/music_player/data/back.bmp
trunk/target/demos/music_player/data/font.ttf
trunk/target/demos/music_player/data/mus.bmp
trunk/target/demos/music_player/data/pause.bmp
trunk/target/demos/music_player/data/play.bmp
trunk/target/demos/music_player/data/stop.bmp
trunk/target/demos/music_player/data/vol.bmp
trunk/target/demos/music_player/music/
trunk/target/demos/music_player/player.c
Added: trunk/target/demos/music_player/Makefile
===================================================================
--- trunk/target/demos/music_player/Makefile (rev 0)
+++ trunk/target/demos/music_player/Makefile 2009-06-01 10:10:53 UTC (rev 1313)
@@ -0,0 +1,39 @@
+# Compil ARM
+ifeq ($(TARGET),arm)
+ARMADEUS_BASE_DIR:=$(shell pwd)/../../..
+include $(ARMADEUS_BASE_DIR)/Makefile.in
+STAGING_DIR:=$(ARMADEUS_BUILD_DIR)/staging_dir/
+INSTALL_DIR:=$(ARMADEUS_ROOTFS_DIR)/usr/bin/
+CC=$(ARMADEUS_TOOLCHAIN_PATH)/arm-linux-gcc
+DEFINES="-DAPF"
+CFLAGS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --cflags) -g
+LIBS:=$(shell STAGING_DIR=$(STAGING_DIR) sh $(ARMADEUS_SDL_DIR)/sdl-config --libs) -lSDL_ttf -lSDL_mixer
+
+else
+# Compil HOST
+CC=gcc
+CFLAGS=`/usr/bin/sdl-config --cflags`
+LIBS=`/usr/bin/sdl-config --libs` -lSDL_ttf -lSDL_mixer
+DEFINES="-DHOST"
+
+endif
+
+
+EXEC_NAME=aplayer
+default: $(EXEC_NAME)
+
+all: $(EXEC_NAME)
+
+
+main.o: player.c
+ $(CC) $(CFLAGS) $(DEFINES) -c -o $@ $^
+
+$(EXEC_NAME): player.o
+ $(CC) $(LIBS) -o $@ $^
+
+clean:
+ rm -rf $(EXEC_NAME)
+ rm -rf *.o
+
+.PHONY: clean uninstall
+
Property changes on: trunk/target/demos/music_player/Makefile
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/target/demos/music_player/README
===================================================================
--- trunk/target/demos/music_player/README (rev 0)
+++ trunk/target/demos/music_player/README 2009-06-01 10:10:53 UTC (rev 1313)
@@ -0,0 +1,84 @@
+*****************************************
+ *** SDL Example: audio player for apf ***
+ *****************************************
+
+
+Music Player for apf9328 (and apf27 ?)
+Requires SDL, SDL_ttf and SDL_mixer libs
+Audio format supported: WAV ...( + OGG on host computer)
+Date: 24/05/09
+Version: 1.0
+Author: rebouxan
+
+*** Repertories ***
+
+ * data: contains the background, fonts and icones ...
+
+ * music: here you have to drop the music you want the player to read.
+ Files must have the same audio_rate which is (#)DEFINEd in player.c by AUDIO_RATE.
+ /!\ You have to limit song files' carateres at 10 or a little more. exemple: musiciswav.wav
+
+ You can change the music directory and take for instance /mnt/mmc to play your SD card on your apf
+ by changing MUSIC_DIR var in player.c before compilation or by executing the player with the repertory
+ you want to read in arg: for instance, #./aplayer /mnt/mmc
+ /!\ Try to limit pathnames' carateres.
+
+*** keyboard commands ***
+You can see keyboard commands in player.c -> function 'handleKey()'
+The main commands are:
+ -"o": play/stop
+ -"p": pause stop
+ -"-/+": volume down/up
+ -"q": quit
+
+
+*********************
+*** x86 Compiling ***
+*********************
+
+1/ Install all required libs
+ * On Red Hat-like distrib:
+ # yum install SDL SDL_ttf SDL_mixer
+ # yum install SDL-devel SDL_ttf-devel SDL_mixer-devel
+
+2/ Compile the code
+ In the player directory, execute:
+ $ make
+
+3/ Put some WAV or OGG files in "music/"
+
+4/ Enjoy :) => $./fplayer
+
+5/ Cleaning: $ make clean
+
+
+*********************
+*** ARM compiling ***
+*********************
+
+1/ Install all required libs
+ * Go to armadeus repertory
+ * $ make apf9328-menuconfig
+ * select "package selection for the target"
+ * select "SDL", "SDL_ttf" and "SDL_mixer"
+ * $ make
+
+2/ Compile the code
+ $ make TARGET=arm
+
+3/ If SDL libs were not installed, update your apf rootfs to have SDL libs on your board
+
+4/ Put the executable (aplayer) with data and music repertories on the board
+ Plug a usb keyboard on your devFull
+
+5/ Load the sound modules:
+ modprobe spi_imx
+ modprobe snd-imx-alsa-tsc2102
+ modprobe snd-pcm-oss
+ modprobe snd-mixer-oss
+
+6/ Execute: #./aplayer
+
+7/ Cleaning: $ make TARGET=arm clean
+
+
Added: trunk/target/demos/music_player/S60mp
===================================================================
--- trunk/target/demos/music_player/S60mp (rev 0)
+++ trunk/target/demos/music_player/S60mp 2009-06-01 10:10:53 UTC (rev 1313)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# sound module
+modprobe spi_imx
+modprobe snd-imx-alsa-tsc2102
+modprobe snd-pcm-oss
+modprobe snd-mixer-oss
+
+# azerty keyboard
+loadkmap < /etc/i18n/fr.kmap
+
+# mount SD card
+mount /dev/mmcblk0p1 /mnt/mmc/
+
+# if aplayer & data in /home
+cd /home
+# launch aplayer
+/home/aplayer /mnt/mmc
+
+
Property changes on: trunk/target/demos/music_player/S60mp
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/target/demos/music_player/data/back.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/target/demos/music_player/data/back.bmp
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/target/demos/music_player/data/font.ttf
===================================================================
(Binary files differ)
Property changes on: trunk/target/demos/music_player/data/font.ttf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/target/demos/music_player/data/mus.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/target/demos/music_player/data/mus.bmp
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/target/demos/music_player/data/pause.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/target/demos/music_player/data/pause.bmp
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/target/demos/music_player/data/play.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/target/demos/music_player/data/play.bmp
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/target/demos/music_player/data/stop.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/target/demos/music_player/data/stop.bmp
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/target/demos/music_player/data/vol.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/target/demos/music_player/data/vol.bmp
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/octet-stream
Added: trunk/target/demos/music_player/player.c
===================================================================
--- trunk/target/demos/music_player/player.c (rev 0)
+++ trunk/target/demos/music_player/player.c 2009-06-01 10:10:53 UTC (rev 1313)
@@ -0,0 +1,661 @@
+/* Author: rebouxan
+ * 26/05/2009
+ * MP v1.0
+ *
+ * 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
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301, USA.
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "SDL/SDL.h"
+#include "SDL/SDL_mixer.h"
+#include "SDL/SDL_ttf.h"
+#include <dirent.h>
+
+/* The music directory that has to be loaded */
+#define MUSIC_DIR "music"
+
+/* Song sampling */
+#define AUDIO_RATE 44100
+
+/* MusicDir max files number */
+#define NB_FILES_MAX 32
+
+/* Functions' prototypes *****/
+// in order of appearence ...
+void initAll();
+void cleanAll();
+void exitr();
+void handleKey(SDL_KeyboardEvent key);
+void musicDone();
+void openSong();
+void playRep();
+void openRep();
+void timePlay();
+void timeReset();
+void displayBack();
+void displayTime();
+void displayVol();
+void displaySong();
+void displayRep();
+void displayAll();
+
+/* Global Vars **********/
+
+ int done = 0;
+ int vol=64;
+
+ SDL_Surface *screen = NULL,
+ *background = NULL,
+ *icoMusic = NULL,
+ *icoPlay = NULL,
+ *icoVol = NULL,
+ *textVol = NULL,
+ *textSong = NULL,
+ *timer =NULL,
+ *nameRep = NULL,
+ *nbMusic = NULL;
+
+ SDL_Surface *playlist[NB_FILES_MAX];
+
+ SDL_Event event;
+
+ Mix_Music *music = NULL;
+
+ /* Fonts */
+ TTF_Font *fontSong = NULL,
+ *fontTimer = NULL,
+ *fontVol = NULL,
+ *fontRep = NULL;
+
+ /* Font colors */
+ SDL_Color cBlack = {0, 0, 0},
+ cWhite = {255, 255, 255},
+ cSong = {252, 185, 15};
+
+ const char *icons[] = {"data/play.bmp","data/pause.bmp","data/stop.bmp"};
+ char *tracks[NB_FILES_MAX]; /* without filepath */
+ char musicDir[64];
+
+ int numIcon =2;
+ int numSongPlay=0;
+ int nbFile=0; //var counter nb files
+ int currentTime = 0, previousTime = 0, counter = 0;
+ int second = 0, minute = 0;
+ int nbSongHigh = 0;
+ int nb_song_display=0;
+ int next=0,prev=0, yRep=0;
+
+/*
+ * main
+ *
+ *********************************/
+int main(int argc, char **argv)
+{
+ /* Take the arg if there is one */
+ if (argc == 2) {
+ strcpy(musicDir,argv[1]);
+ }
+ else strcpy(musicDir,MUSIC_DIR);
+
+ /* We initialise all we need */
+ initAll();
+
+ /* while done=0, the player keep on running */
+ while (!done) {
+ while (SDL_PollEvent(&event)) {
+ switch (event.type) {
+ case SDL_QUIT:
+ done = 1;
+ break;
+ case SDL_KEYDOWN:
+ if (event.key.keysym.sym == SDLK_q)
+ done=1;
+ handleKey(event.key);
+ break;
+ }
+ }
+ /* TIMER */
+ timePlay();
+
+ /* Display function */
+ displayAll();
+
+ /* Limit the use of the CPU */
+ SDL_Delay(50);
+ }
+
+ /* This is the cleaning up part */
+ cleanAll();
+ return 0;
+} /***************End_main()*********/
+
+/*
+ * Initialise all kind of things we need
+ * */
+void initAll()
+{
+ /* SDL init */
+ SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO);
+ TTF_Init();
+
+ /* Hide the mouse */
+ SDL_ShowCursor(0);
+
+ /* Enable Key repeat */
+ SDL_EnableKeyRepeat(100, 100);
+
+ /* This is where we open up our audio device */
+ if (Mix_OpenAudio(AUDIO_RATE, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096)) {
+ printf("Unable to open audio! %s\n", Mix_GetError());
+ exitr();
+ }
+
+ /* Set the video mode to LQ043 resolution */
+ screen = SDL_SetVideoMode(480, 272, 0, SDL_ANYFORMAT);
+ if (screen == NULL) {
+ printf("Unable to set video mode: %s\n", SDL_GetError());
+ exitr();;
+ }
+
+ /* Fonts opening */
+ fontSong = TTF_OpenFont("data/font.ttf", 42);
+ fontTimer = TTF_OpenFont("data/font.ttf", 30);
+ fontVol = TTF_OpenFont("data/font.ttf", 20);
+ fontRep = TTF_OpenFont("data/font.ttf", 16);
+ /* To avoid seg-error if problems with fonts */
+ if (!fontSong||!fontTimer||!fontVol||!fontRep) {
+ printf("TTF_OpenFont: %s\n", TTF_GetError());
+ exitr();
+ }
+
+ /* We open the dir where songs are ... */
+ openRep();
+
+} /**** End of Init ****/
+
+/*
+ * Close and clean all parts
+ * */
+void cleanAll()
+{
+ Mix_CloseAudio();
+
+ TTF_CloseFont(fontSong);
+ TTF_CloseFont(fontTimer);
+ TTF_CloseFont(fontVol);
+ TTF_CloseFont(fontRep);
+
+ TTF_Quit();
+
+ SDL_FreeSurface(textSong);
+ SDL_FreeSurface(textVol);
+ SDL_FreeSurface(nameRep);
+ SDL_FreeSurface(nbMusic);
+ SDL_FreeSurface(timer);
+ SDL_FreeSurface(icoMusic);
+ SDL_FreeSurface(icoVol);
+ SDL_FreeSurface(icoPlay);
+ SDL_FreeSurface(background);
+ SDL_FreeSurface(screen);
+
+ SDL_Quit();
+}
+
+/*
+ * If troubles, clean all before exiting
+ * */
+void exitr()
+{
+ cleanAll();
+ exit(0);
+}
+
+/*
+ * Function that runs Keyboard events
+ * */
+void handleKey(SDL_KeyboardEvent key)
+{
+ switch(key.keysym.sym) {
+
+ case SDLK_o: // Play/stop
+ if (key.state == SDL_PRESSED) {
+ openSong();
+ }
+ break;
+
+ case SDLK_p: // Pause/resume
+ if (key.state == SDL_PRESSED) {
+ if (music !=NULL) {
+ if (Mix_PausedMusic()) {
+ Mix_ResumeMusic();
+ numIcon=0;
+ } else {
+ Mix_PauseMusic();
+ numIcon=1;
+ }
+ }
+ else openSong();
+ }
+ break;
+
+ /* 32 volume levels */
+ case SDLK_KP_MINUS: // volume down
+ if (key.state == SDL_PRESSED)
+ if (vol>0) {
+ vol=vol-4;
+ Mix_VolumeMusic(vol);
+ }
+ break;
+
+ case SDLK_KP_PLUS: // volume up
+ if (key.state == SDL_PRESSED)
+ if (vol<128) {
+ vol=vol+4;
+ Mix_VolumeMusic(vol);
+ }
+ break;
+
+ case SDLK_v: // volume to 128 (max)
+ if (key.state == SDL_PRESSED)
+ vol=128;
+ Mix_VolumeMusic(vol);
+ break;
+
+ case SDLK_LEFT: // previous song
+ if( key.state == SDL_PRESSED) {
+ if (numSongPlay>0) {
+ if (music !=NULL) musicDone();
+ numSongPlay=numSongPlay-1;
+ openSong();
+ }
+ }
+ break;
+
+ case SDLK_RIGHT: // next song
+ if (key.state == SDL_PRESSED) {
+ if (numSongPlay<nbFile-1) {
+ if (music !=NULL) musicDone();
+ numSongPlay=numSongPlay+1;
+ openSong();
+ }
+ }
+ break;
+
+ /* Song cursor with highlighting ... */
+ case SDLK_UP: // Up
+ if (nbSongHigh>0) {
+ nbSongHigh--;
+ prev=1;
+ next=0;
+ }
+ break;
+
+ case SDLK_DOWN: // Down
+ if (nbSongHigh<nbFile-1) {
+ nbSongHigh++;
+ prev=0;
+ next=1;
+ }
+ break;
+
+ case SDLK_RETURN: // Play highlighted song
+ numSongPlay=nbSongHigh;
+ if (music != 0)
+ musicDone();
+ openSong();
+ break;
+ }
+}
+
+/*
+ * Unload and free the music
+ * */
+void musicDone()
+{
+ if (Mix_PlayingMusic()) numIcon=2;
+ Mix_HaltMusic();
+ Mix_FreeMusic(music);
+ music = NULL;
+}
+
+/*
+ * Load a track and play it
+ * */
+void openSong()
+{
+ /* if music=NULL, load one */
+ if(music == NULL) {
+ /* Add the path to the song */
+ char wps[32] = ""; // char "music/song"
+ strcat(wps,musicDir); /* wps="music" */
+ strcat(wps,"/"); /* wps="music/" */
+ strcat(wps,tracks[numSongPlay]);/* wps="music/song" */
+
+ /* Loads up the music */
+ music = Mix_LoadMUS(wps);
+ /* Set its volume */
+ Mix_VolumeMusic(vol);
+ /* Reset the timer */
+ timeReset();
+ /* And play it */
+ Mix_PlayMusic(music, 0);
+ /* Set play icon */
+ numIcon=0;
+
+ /* When the song's over, play the next one */
+ Mix_HookMusicFinished(playRep);
+ } else { /* music !=NULL */
+ /* Stop the music from playing And free it */
+ musicDone();
+ }
+}
+
+/* Play the whole directory
+ * When a music is over, the next is played
+ * */
+void playRep()
+{
+ /* Free Music then load another */
+ musicDone();
+ if (numSongPlay<nbFile-1) {
+ numSongPlay=numSongPlay+1;
+ openSong();
+ } else numIcon=2; // stop icon
+}
+
+/*
+ * Open a musics' directory
+ * */
+void openRep()
+{
+ DIR *rep ;
+ struct dirent *file ;
+
+ /* open rep ****/
+ rep = opendir (musicDir) ;
+ int count=0;
+
+ if (rep != NULL) { // if rep not null, we put filenames in a tab
+ /* 1- Count how many files in musicDir */
+ while (file = readdir(rep))
+ // Don't display . and ..
+ if (strcmp(file->d_name, "." ) == 0 || strcmp(file->d_name, ".." ) == 0)
+ continue;
+ else nbFile++;
+
+ /* 2- Go back to the begining of the rep */
+ rewinddir(rep);
+
+ /* 3- Put filename in a tab */
+ while (file = readdir(rep)) {
+ if (strcmp(file->d_name, "." ) == 0 || strcmp(file->d_name, ".." ) == 0)
+ continue;
+ else {
+ tracks[count]= (char *) malloc(sizeof(file->d_name) + 1);
+ strcpy(tracks[count++],file->d_name);
+ }
+ }
+
+ /* close rep ****/
+ (void) closedir (rep) ;
+ } else { // else program shutdown
+ printf("Unable to load musicDir ! Check if your music repertory is called '%s'\n",musicDir);
+ exitr();
+ }
+
+ /* init nb_song_display
+ * by default, songs are displayed by 9
+ */
+ if (nbFile == 0) {
+ printf("No file in %s directory ! Please put some.\n",musicDir);
+ exitr();
+ }
+
+ /* Number of files to display */
+ if (nbFile >= 10)
+ nb_song_display=9;
+ else
+ nb_song_display=nbFile;
+
+ /* if too many files */
+ if (nbFile > NB_FILES_MAX) {
+ printf("Too many files in %s directory ! Please remove some.\n",musicDir);
+ exitr();
+ }
+}
+
+/*
+ * Increase timer each one second
+ * */
+void timePlay()
+{
+ /* If music is played ... */
+ if (Mix_PlayingMusic() && !Mix_PausedMusic()) {
+ /* ... we take the time */
+ currentTime = SDL_GetTicks();
+ }
+ /* */
+ if (currentTime - previousTime >= 1000) {
+ counter += 1000; /* we add 1000ms to the time counter */
+ previousTime = currentTime; /* Update previousTime */
+ }
+}
+
+/* Reset the timer
+ * when a new song is played
+ * */
+void timeReset()
+{
+ previousTime = 0;
+ counter = 0;
+ minute=0;
+}
+
+/*
+ * Display Backscreen
+ * */
+void displayBack()
+{
+ SDL_FreeSurface(background);
+ background = SDL_LoadBMP("data/back.bmp");
+ if (!background) {
+ printf("%s\n", SDL_GetError());
+ exitr();
+ }
+ SDL_BlitSurface(background, NULL, screen, 0);
+}
+
+/*
+ * Display state of the player
+ * */
+void displayTime()
+{
+ char secondes[8] = "", minutes[8] = "00:00";
+ SDL_Rect position;
+
+ /* Display play/pause/stop icons */
+ SDL_FreeSurface(icoPlay);
+ icoPlay = SDL_LoadBMP(icons[numIcon]);
+ if(!icoPlay) {
+ printf("%s\n", SDL_GetError());
+ exitr();
+ }
+ /* Set transparency */
+ SDL_SetColorKey(icoPlay, SDL_SRCCOLORKEY, SDL_MapRGB(icoPlay->format, 255, 255, 255));
+ SDL_SetAlpha(icoPlay, SDL_SRCALPHA, 128);
+ position.x = 29;
+ position.y = 150;
+ SDL_BlitSurface(icoPlay, NULL, screen, &position);
+
+ /* Display Timer */
+ second=counter/1000;
+ /* when 60s, pass to 1 min */
+ if (second+1 > 60) {
+ second=0;
+ counter=0;
+ minute++;
+ }
+
+ /* if minute or second <10, we put a 0 above ... */
+ if (minute < 10)
+ sprintf(minutes, "0%d", minute);
+ else
+ sprintf(minutes, "%d", minute);
+ if (second < 10)
+ sprintf(secondes, "0%d", second);
+ else
+ sprintf(secondes, "%d", second);
+
+ /* add minute and second */
+ strcat(minutes,":"); /* minutes= 00: */
+ strcat(minutes,secondes); /* minutes= 00:00 */
+
+ /* the real Display part */
+ SDL_FreeSurface(timer);
+ timer = TTF_RenderText_Blended(fontTimer, minutes, cBlack);
+ position.x = 73;
+ position.y = 150;
+ SDL_BlitSurface(timer, NULL, screen, &position);
+}
+
+/*
+ * Display a volum icon and Volume
+ * */
+void displayVol()
+{
+ char volume[32] = ""; /* char "Volume: vol" */ //!!!
+ SDL_Rect position;
+
+ /* Display icoVol */
+ SDL_FreeSurface(icoVol);
+ icoVol = SDL_LoadBMP("data/vol.bmp");
+ if (!icoVol) {
+ printf("%s\n", SDL_GetError());
+ exitr();
+ }
+ /* Set transparency */
+ SDL_SetColorKey(icoVol, SDL_SRCCOLORKEY, SDL_MapRGB(icoVol->format, 255, 255, 255));
+ SDL_SetAlpha(icoVol, SDL_SRCALPHA, 128);
+ position.x = 35;
+ position.y = 200;
+ SDL_BlitSurface(icoVol, NULL, screen, &position);
+
+ /* Display the Volume */
+ int vol4 = vol/4;
+ sprintf(volume, "Volume: %d ", vol4);
+ SDL_FreeSurface(textVol);
+ textVol = TTF_RenderText_Blended(fontVol, volume, cBlack);
+ position.x = 71;
+ position.y = 203;
+ SDL_BlitSurface(textVol, NULL, screen, &position);
+}
+
+/*
+ * Display an icon and the name of the song on the screen
+ * */
+void displaySong()
+{
+ SDL_Rect position;
+
+ /* Display icoMusic */
+ SDL_FreeSurface(icoMusic);
+ icoMusic = SDL_LoadBMP("data/mus.bmp");
+ if (!icoMusic) {
+ printf("%s\n", SDL_GetError());
+ exitr();
+ }
+ /* Set transparency */
+ SDL_SetColorKey(icoMusic, SDL_SRCCOLORKEY, SDL_MapRGB(icoMusic->format, 255, 255, 255));
+ SDL_SetAlpha(icoMusic, SDL_SRCALPHA, 128);
+ position.x = 18;
+ position.y = 80;
+ SDL_BlitSurface(icoMusic, NULL, screen, &position);
+
+ /* Display song name next to icoMusic */
+ SDL_FreeSurface(textSong);
+ textSong = TTF_RenderText_Blended(fontSong, tracks[numSongPlay], cBlack);
+ position.x = 75;
+ position.y = 85;
+ SDL_BlitSurface(textSong, NULL, screen, &position);
+}
+
+/*
+ * Display music rep
+ * */
+void displayRep()
+{
+ /* Cleaning */
+ int j;
+ for (j=yRep;j<nb_song_display+yRep;j++)
+ SDL_FreeSurface(playlist[j]);
+
+ SDL_Rect position;
+ /* Writing musicDir name */
+ SDL_FreeSurface(nameRep);
+ nameRep = TTF_RenderText_Blended(fontVol, musicDir, cBlack);
+ position.x = 305;
+ position.y = 68;
+ SDL_BlitSurface(nameRep, NULL, screen, &position);
+
+ /* Display the number of files in musicDir */
+ SDL_FreeSurface(nbMusic);
+ char files[32];
+ sprintf(files, "(%d)", nbFile);
+ nbMusic = TTF_RenderText_Blended(fontVol, files, cBlack);
+ position.x = 430;
+ position.y = 68;
+ SDL_BlitSurface(nbMusic, NULL, screen, &position);
+
+ /* */
+ int i;int pos=0;
+ if (nbSongHigh >= nb_song_display && next) if (yRep<(nbFile-nb_song_display)) {
+ yRep++;
+ next=0;
+ }
+ if (nbSongHigh <= nb_song_display && prev) if (yRep>0) {
+ yRep--;
+ prev=0;
+ }
+
+ for (i=yRep;i<nb_song_display+yRep;i++) {
+ /* Highlight song selected by the cursor */
+ if (i != nbSongHigh)
+ playlist[i] = TTF_RenderText_Shaded(fontRep, tracks[i], cBlack, cWhite);
+ else
+ playlist[i] = TTF_RenderText_Shaded(fontRep, tracks[i], cBlack, cSong);
+ position.x = 355;
+ position.y = 95+pos*19;
+ SDL_BlitSurface(playlist[i], NULL, screen, &position);
+ pos++;
+ }
+}
+
+/*
+ * Display all the elements
+ * */
+void displayAll()
+{
+ /* Call the different display functions */
+ displayBack();
+ displayTime();
+ displaySong();
+ displayVol();
+ displayRep();
+ /* Refresh the Screen */
+ SDL_Flip(screen);
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-05-31 17:32:00
|
Revision: 1312
http://armadeus.svn.sourceforge.net/armadeus/?rev=1312&view=rev
Author: jorasse
Date: 2009-05-31 17:31:57 +0000 (Sun, 31 May 2009)
Log Message:
-----------
[ARMADEUS] prepare new release
Modified Paths:
--------------
trunk/ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-05-27 20:52:21 UTC (rev 1311)
+++ trunk/ChangeLog 2009-05-31 17:31:57 UTC (rev 1312)
@@ -4,6 +4,10 @@
----
+Changes since last release
+
+----
+
Changes in release 3.0 (25 feb 2009 - SVN revisions 763 to 1097)
* Buildroot:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-05-27 20:52:30
|
Revision: 1311
http://armadeus.svn.sourceforge.net/armadeus/?rev=1311&view=rev
Author: artemys
Date: 2009-05-27 20:52:21 +0000 (Wed, 27 May 2009)
Log Message:
-----------
[LINUX] Rename some framebuffer related patches
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-27 17:59:13 UTC (rev 1310)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-27 20:52:21 UTC (rev 1311)
@@ -1,55 +0,0 @@
-
-When configured with a TFT LCD interface i.MX(1/2) LCD controller can support
-16, 12, 8 & 4bpp framebuffers with the same hardware interface (12 to 16 bits).
-So if userspace app wants a 8bpp screen, we switch to 8bpp. This can save
-ressources (mem + proc), when using SDL for example.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
-===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 19:52:33.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 09:15:52.000000000 +0200
-@@ -14,6 +14,7 @@
- #define PCR_BPIX_8 (3 << 25)
- #define PCR_BPIX_12 (4 << 25)
- #define PCR_BPIX_16 (4 << 25)
-+#define PCR_BPIX_MASK (7 << 25)
- #define PCR_PIXPOL (1 << 24)
- #define PCR_FLMPOL (1 << 23)
- #define PCR_LPPOL (1 << 22)
-Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
-===================================================================
---- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 19:52:35.000000000 +0200
-+++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 09:15:52.000000000 +0200
-@@ -14,6 +14,7 @@
- #define PCR_BPIX_8 (3 << 25)
- #define PCR_BPIX_12 (4 << 25)
- #define PCR_BPIX_16 (4 << 25)
-+#define PCR_BPIX_MASK (7 << 25)
- #define PCR_PIXPOL (1 << 24)
- #define PCR_FLMPOL (1 << 23)
- #define PCR_LPPOL (1 << 22)
-Index: linux-2.6.29/drivers/video/imxfb.c
-===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-27 09:15:03.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 09:19:32.000000000 +0200
-@@ -523,7 +523,17 @@
- /* add sync polarities */
- pcr |= fbi->pcr & ~0x3F;
-
-- writel(pcr, fbi->regs + LCDC_PCR);
-+ /* i.MX LCD controller can support 8bpp even if configured to output 16 bits (TFT) */
-+ if ((var->bits_per_pixel == 8) && (fbi->pcr & PCR_TFT)) {
-+ pr_debug("Switching imxfb to 8bpp\n");
-+ writel((pcr & (~PCR_BPIX_MASK)) |
-+ PCR_BPIX_8 |
-+ PCR_END_BYTE_SWAP,
-+ fbi->regs + LCDC_PCR);
-+ } else {
-+ writel(pcr, fbi->regs + LCDC_PCR);
-+ }
-+ writel(VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4), fbi->regs + LCDC_VPW);
-
- return 0;
- }
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch 2009-05-27 17:59:13 UTC (rev 1310)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch 2009-05-27 20:52:21 UTC (rev 1311)
@@ -7,8 +7,8 @@
Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
===================================================================
---- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 11:43:17.000000000 +0200
-+++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 11:49:26.000000000 +0200
+--- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 20:07:19.000000000 +0200
++++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 21:09:24.000000000 +0200
@@ -13,7 +13,12 @@
#define PCR_BPIX_4 (2 << 25)
#define PCR_BPIX_8 (3 << 25)
@@ -19,15 +19,6 @@
+#define PCR_BPIX_16 (5 << 25)
+#define PCR_BPIX_18 (6 << 25)
+#endif
- #define PCR_BPIX_MASK (7 << 25)
#define PCR_PIXPOL (1 << 24)
#define PCR_FLMPOL (1 << 23)
-@@ -22,7 +27,7 @@
- #define PCR_OEPOL (1 << 20)
- #define PCR_SCLKIDLE (1 << 19)
- #define PCR_END_SEL (1 << 18)
--#define PCR_END_BYTE_SWAP ( 1<< 17)
-+#define PCR_END_BYTE_SWAP (1 << 17)
- #define PCR_REV_VS (1 << 16)
- #define PCR_ACD_SEL (1 << 15)
- #define PCR_ACD(x) (((x) & 0x7f) << 8)
+ #define PCR_LPPOL (1 << 22)
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch (from rev 1309, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/334-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-27 20:52:21 UTC (rev 1311)
@@ -0,0 +1,55 @@
+
+When configured with a TFT LCD interface i.MX(1/2) LCD controller can support
+16, 12, 8 & 4bpp framebuffers with the same hardware interface (12 to 16 bits).
+So if userspace app wants a 8bpp screen, we switch to 8bpp. This can save
+ressources (mem + proc), when using SDL for example.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 20:07:17.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 21:11:01.000000000 +0200
+@@ -14,6 +14,7 @@
+ #define PCR_BPIX_8 (3 << 25)
+ #define PCR_BPIX_12 (4 << 25)
+ #define PCR_BPIX_16 (4 << 25)
++#define PCR_BPIX_MASK (7 << 25)
+ #define PCR_PIXPOL (1 << 24)
+ #define PCR_FLMPOL (1 << 23)
+ #define PCR_LPPOL (1 << 22)
+Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 21:09:24.000000000 +0200
++++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 21:11:39.000000000 +0200
+@@ -19,6 +19,7 @@
+ #define PCR_BPIX_16 (5 << 25)
+ #define PCR_BPIX_18 (6 << 25)
+ #endif
++#define PCR_BPIX_MASK (7 << 25)
+ #define PCR_PIXPOL (1 << 24)
+ #define PCR_FLMPOL (1 << 23)
+ #define PCR_LPPOL (1 << 22)
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-27 21:07:41.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 21:11:01.000000000 +0200
+@@ -523,7 +523,17 @@
+ /* add sync polarities */
+ pcr |= fbi->pcr & ~0x3F;
+
+- writel(pcr, fbi->regs + LCDC_PCR);
++ /* i.MX LCD controller can support 8bpp even if configured to output 16 bits (TFT) */
++ if ((var->bits_per_pixel == 8) && (fbi->pcr & PCR_TFT)) {
++ pr_debug("Switching imxfb to 8bpp\n");
++ writel((pcr & (~PCR_BPIX_MASK)) |
++ PCR_BPIX_8 |
++ PCR_END_BYTE_SWAP,
++ fbi->regs + LCDC_PCR);
++ } else {
++ writel(pcr, fbi->regs + LCDC_PCR);
++ }
++ writel(VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4), fbi->regs + LCDC_VPW);
+
+ return 0;
+ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-05-27 18:00:14
|
Revision: 1310
http://armadeus.svn.sourceforge.net/armadeus/?rev=1310&view=rev
Author: artemys
Date: 2009-05-27 17:59:13 +0000 (Wed, 27 May 2009)
Log Message:
-----------
[LINUX] Add the possibility to choose between Freescale or Mainline framebuffer driver for APF27
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/233-apf27-pengu-mx2_framebuffer_beta.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/295-apf27-armadeus-imxfb-modify_imxfb_device_name_for_freescale_driver.patch
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-makes_mainline_driver_selectable_for_mx2.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch
Modified: trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config 2009-05-27 17:52:14 UTC (rev 1309)
+++ trunk/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config 2009-05-27 17:59:13 UTC (rev 1310)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29
-# Wed May 13 09:02:28 2009
+# Wed May 27 19:47:22 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1068,7 +1068,7 @@
# Graphics support
#
# CONFIG_VGASTATE is not set
-# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_DDC is not set
@@ -1091,6 +1091,7 @@
#
# Frame buffer hardware drivers
#
+# CONFIG_FB_IMX is not set
CONFIG_FB_IMX_SHARP_LQ043_TFT=y
# CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT is not set
# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch 2009-05-27 17:52:14 UTC (rev 1309)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch 2009-05-27 17:59:13 UTC (rev 1310)
@@ -4,7 +4,7 @@
Index: linux-2.6.29/arch/arm/mach-imx/apf9328.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29/arch/arm/mach-imx/apf9328.c 2009-05-21 21:20:41.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/apf9328.c 2009-05-27 09:33:57.000000000 +0200
@@ -0,0 +1,816 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
@@ -825,8 +825,8 @@
Index: linux-2.6.29/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29/arch/arm/mach-imx/apf9328_lcd_config.h 2009-05-22 15:35:56.000000000 +0200
-@@ -0,0 +1,277 @@
++++ linux-2.6.29/arch/arm/mach-imx/apf9328_lcd_config.h 2009-05-27 17:11:00.000000000 +0200
+@@ -0,0 +1,301 @@
+/*
+ *
+ * Armadeus LCD configuration file
@@ -837,46 +837,57 @@
+ *
+ */
+
-+#ifndef APF9328_LCD_CONFIG_H
-+#define APF9328_LCD_CONFIG_H
++#ifndef APF_LCD_CONFIG_H
++#define APF_LCD_CONFIG_H
+
+
+#ifdef CONFIG_FB_IMX
++
+#include <mach/imxfb.h>
+#include <linux/delay.h>
+#include <mach/gpio.h>
+
+#ifdef CONFIG_ARCH_IMX
+#define LCDC_BASE_ADDR IMX_LCDC_BASE
++#endif
+#define LCDISR_EOF (1 << 1)
-+#endif
+
++#ifdef CONFIG_MACH_APF9328
+#define OPTREX_F51900_POWER_DOWN (GPIO_PORTD | 7) /* PD7_REV */
+#define SHARP_LQ043_POWER_DOWN (GPIO_PORTD | 12) /* PD12_ACD_OE */
+#define CONTRAST_LINE (GPIO_PORTD | 11) /* PD11_CONTRAST */
++#endif
+
++#ifdef CONFIG_MACH_APF27
++#define OPTREX_F51900_POWER_DOWN (GPIO_PORTA | 24) /* PA24_REV */
++#define SHARP_LQ043_POWER_DOWN (GPIO_PORTA | 31) /* PA31_OE_ACD */
++#define CONTRAST_LINE (GPIO_PORTA | 30) /* PA30_CONTRAST */
++#endif
++
+#define DEFAULT_DMA_SETTINGS (DMACR_BURST | DMACR_HM(8) | DMACR_TM(4))
+
++#ifdef CONFIG_MACH_APF9328
++static int apf9328_fb_init(struct platform_device *pdev);
++static int apf9328_fb_exit(struct platform_device *pdev);
++#endif
+
-+static int imx_fb_gpios_init(struct platform_device *pdev);
-+static int imx_fb_gpios_exit(struct platform_device *pdev);
-+
+/*
+ * Power on/off LCD's internal logic
+ */
-+static void apf9328_lcd_power(int on)
++static void apf_lcd_power(int on)
+{
+ u32 isr;
+
-+ pr_debug("apf9328_lcd_power: %s\n", on ? "on":"off");
++ pr_debug("%s: %s\n", __func__, on ? "on":"off");
++ 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 CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT
++#elif defined(CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT)
+ /* No LCD powerdown yet */
-+#elif CONFIG_FB_IMX_SHARP_LQ043_TFT
++#elif defined(CONFIG_FB_IMX_SHARP_LQ043_TFT)
+ if (on) {
+ mdelay(200); /* at least ten frames have to be processed before
+ enabling the display */
@@ -907,15 +918,17 @@
+/*
+ * Power on/off LCD's backlight
+ */
-+static void apf9328_lcd_backlight_power(int on)
++static void apf_lcd_backlight_power(int on)
+{
+ u32 pwmr;
+
-+ pr_debug("apf9328_lcd_backlight_power: %s\n", on ? "on":"off");
++ pr_debug("%s: %s\n", __func__, on ? "on":"off");
+
+ pwmr = readl(IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c);
-+ if( pwmr )
++#ifdef CONFIG_MACH_APF9328
++ if (pwmr)
+ imx_gpio_mode(PD11_PF_CONTRAST);
++#endif
+ if (on) {
+ pwmr |= PWMR_CC_EN;
+ } else {
@@ -924,10 +937,13 @@
+ writel(pwmr, IO_ADDRESS(LCDC_BASE_ADDR) + 0x2c);
+}
+
-+
++#ifdef CONFIG_MACH_APF9328
+static struct imx_fb_platform_data apf9328_fb_info /*__initdata*/ = {
++#elif CONFIG_MACH_APF27
++static struct imx_fb_platform_data apf27_fb_data = {
++#endif
+#ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
-+ .pixclock = 62500,
++ .pixclock = 125000, /* picoS -> ~8MHz */
+ .bpp = 16,
+ .xres = 480,
+ .yres = 272,
@@ -943,10 +959,10 @@
+ PCR_CLKPOL | PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(5),
+ .pwmr = 0x000003ff, /* Contrast with PWM @ Pixel clock / 256, max width by default */
+ .dmacr = DEFAULT_DMA_SETTINGS,
-+ .backlight_power= apf9328_lcd_backlight_power,
-+ .lcd_power = apf9328_lcd_power,
++ .backlight_power= apf_lcd_backlight_power,
++ .lcd_power = apf_lcd_power,
+#elif CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT
-+ .pixclock = 62500,
++ .pixclock = 156250, /* picoS -> ~6.4MHz */
+ .bpp = 16,
+ .xres = 320,
+ .yres = 240,
@@ -962,9 +978,10 @@
+ PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(7),
+ .pwmr = 0x00000150, /* Contrast with PWM @ Line Pulse / 256, medium width by default */
+ .dmacr = DEFAULT_DMA_SETTINGS,
-+ .backlight_power= apf9328_lcd_backlight_power,
++ .backlight_power= apf_lcd_backlight_power,
++ .lcd_power = apf_lcd_power,
+#elif CONFIG_FB_IMX_SHARP_LQ057_TFT
-+ .pixclock = 62500,
++ .pixclock = 158730, /* picoS -> ~6.3MHz */
+ .bpp = 16,
+ .xres = 320,
+ .yres = 240,
@@ -980,7 +997,7 @@
+ PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(9),
+ .pwmr = 0, /* No contrast management */
+ .dmacr = DEFAULT_DMA_SETTINGS,
-+ .lcd_power = apf9328_lcd_power,
++ .lcd_power = apf_lcd_power,
+#elif CONFIG_FB_IMX_OPTREX_F51900_CSTN
+ .pixclock = 62500,
+ .bpp = 8,
@@ -998,9 +1015,9 @@
+ PCR_END_BYTE_SWAP | PCR_PCD(3),
+ .dmacr = DEFAULT_DMA_SETTINGS,
+ .pwmr = 0, /* No contrast management */
-+ .lcd_power = apf9328_lcd_power,
++ .lcd_power = apf_lcd_power,
+#elif CONFIG_FB_IMX_MOTOROLA_A910_TFT
-+ .pixclock = 62500,
++ .pixclock = 158730, /* picoS -> ~6.3MHz */
+ .bpp = 16,
+ .xres = 240,
+ .yres = 320,
@@ -1016,18 +1033,24 @@
+ PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(9),
+ .dmacr = DEFAULT_DMA_SETTINGS,
+ .pwmr = 0, /* No contrast management */
-+ .lcd_power = apf9328_lcd_power,
++ .lcd_power = apf_lcd_power,
+#else
-+#error Please define a imxfb_mach_info structure with your LCD parameters here
++#error Please define a imx_fb_platform_data structure with your LCD parameters
+#endif
-+ .init = imx_fb_gpios_init,
-+ .exit = imx_fb_gpios_exit,
++#ifdef CONFIG_MACH_APF9328
++ .init = apf9328_fb_init,
++ .exit = apf9328_fb_exit,
++#elif CONFIG_MACH_APF27
++ .init = apf27_fb_init,
++ .exit = apf27_fb_exit,
++#endif
+};
+
+/*
+ * Configure all GPIOs needed by LCDs
+ */
-+static int imx_fb_gpios_init(struct platform_device *pdev)
++#ifdef CONFIG_MACH_APF9328
++static int apf9328_fb_init(struct platform_device *pdev)
+{
+ struct imx_fb_platform_data *fb_inf = &apf9328_fb_info;
+ int width;
@@ -1095,19 +1118,20 @@
+ return 0;
+}
+
-+static int imx_fb_gpios_exit(struct platform_device *pdev)
++static int apf9328_fb_exit(struct platform_device *pdev)
+{
+ /* TO BE DONE */
+ return 0;
+}
++#endif /* CONFIG_MACH_APF9328 */
+
+#endif /* CONFIG_FB_IMX */
+
-+#endif /* APF9328_LCD_CONFIG_H */
++#endif /* APF_LCD_CONFIG_H */
Index: linux-2.6.29/arch/arm/mach-imx/include/mach/apf9328.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/apf9328.h 2009-05-21 21:20:41.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/apf9328.h 2009-05-27 09:33:57.000000000 +0200
@@ -0,0 +1,63 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/233-apf27-pengu-mx2_framebuffer_beta.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/233-apf27-pengu-mx2_framebuffer_beta.patch 2009-05-27 17:52:14 UTC (rev 1309)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/233-apf27-pengu-mx2_framebuffer_beta.patch 2009-05-27 17:59:13 UTC (rev 1310)
@@ -26,7 +26,7 @@
select FB_CFB_IMAGEBLIT
+config FB_MXC
-+ tristate "MXC Framebuffer support"
++ tristate "MXC Framebuffer support (Freescale driver)"
+ depends on FB && ARM && ARCH_MX2
+ select FB_CFB_FILLRECT
+ select FB_CFB_COPYAREA
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch 2009-05-27 17:52:14 UTC (rev 1309)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch 2009-05-27 17:59:13 UTC (rev 1310)
@@ -4,8 +4,8 @@
Index: linux-2.6.29/arch/arm/mach-mx2/apf27.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29/arch/arm/mach-mx2/apf27.c 2009-05-25 14:12:14.000000000 +0200
-@@ -0,0 +1,1560 @@
++++ linux-2.6.29/arch/arm/mach-mx2/apf27.c 2009-05-27 15:46:04.000000000 +0200
+@@ -0,0 +1,1571 @@
+ /*
+ * apf27.c
+ *
@@ -56,8 +56,9 @@
+#include <../mach-imx/include/mach/spi_imx.h>
+#include <mach/imx-uart.h>
+#include <mach/mmc.h>
++#ifdef CONFIG_FB_MXC
+#include <mach/imx_fb.h>
-+#include <mach/imxfb.h>
++#endif
+#include <mach/mxc_nand.h>
+#include <mach/mxc_ehci.h>
+#include <mach/ulpi.h>
@@ -464,7 +465,7 @@
+ mxc_gpio_release_multiple_pins(mxc_fec_pins, ARRAY_SIZE(mxc_fec_pins));
+} */
+
-+#ifdef CONFIG_FB_MXC
++#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
+static int mxc_lcd_pins[] = {
+ PA5_PF_LSCLK,
+ PA6_PF_LD0,
@@ -507,13 +508,15 @@
+
+static int apf27_fb_init(struct platform_device *pdev)
+{
-+#ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
-+ /* For LQ043 OE_ACD is used as LCD Display ON/OFF. shut down TFT */
++#ifdef CONFIG_FB_MXC
++# ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
++ /* For LQ043 OE_ACD is used as LCD Display ON/OFF: activate LCD */
+ gpio_set_value(GPIO_PORTA | 31, 1);
-+#endif
-+#ifdef CONFIG_FB_IMX_SHARP_LQ057_TFT
++# endif
++# ifdef CONFIG_FB_IMX_SHARP_LQ057_TFT
+ /* For LQ057: activate backlight at startup */
+ gpio_set_value(GPIO_PORTA | 30, 0);
++# endif
+#endif
+
+ return mxc_gpio_setup_multiple_pins(mxc_lcd_pins, ARRAY_SIZE(mxc_lcd_pins), "LCD");
@@ -526,17 +529,25 @@
+ return 0;
+}
+
++/* Freescale driver */
++#ifdef CONFIG_FB_MXC
+static struct mxc_fb_platform_data apf27_fb_data = {
-+#ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
++# ifdef CONFIG_FB_IMX_SHARP_LQ043_TFT
+ .mode = "Sharp-LQ043",
-+#elif CONFIG_FB_IMX_SHARP_LQ057_TFT
++# elif CONFIG_FB_IMX_SHARP_LQ057_TFT
+ .mode = "Sharp-LQ057",
-+#endif
++# endif
+ .init = apf27_fb_init,
+ .exit = apf27_fb_exit,
+};
++#endif
+
-+#ifdef CONFIG_IMX_BACKLIGHT
++/* Mainline driver */
++#ifdef 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,
@@ -552,9 +563,9 @@
+ },
+ .id = 0,
+};
-+#endif /* CONFIG_IMX_BACKLIGHT */
++# endif /* CONFIG_IMX_BACKLIGHT */
+
-+#endif /* CONFIG_FB_MXC */
++#endif /* CONFIG_FB_MXC || CONFIG_FB_IMX */
+
+
+#ifdef CONFIG_MMC_MXC
@@ -1514,7 +1525,7 @@
+ ARRAY_SIZE(spi_board_info));
+#endif
+
-+#ifdef CONFIG_FB_MXC
++#if defined(CONFIG_FB_MXC) || defined(CONFIG_FB_IMX)
+ mxc_register_device(&mxc_fb_device, &apf27_fb_data);
+#endif
+
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/295-apf27-armadeus-imxfb-modify_imxfb_device_name_for_freescale_driver.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/295-apf27-armadeus-imxfb-modify_imxfb_device_name_for_freescale_driver.patch 2009-05-27 17:52:14 UTC (rev 1309)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/295-apf27-armadeus-imxfb-modify_imxfb_device_name_for_freescale_driver.patch 2009-05-27 17:59:13 UTC (rev 1310)
@@ -1,13 +1,17 @@
Index: linux-2.6.29/arch/arm/mach-mx2/devices.c
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-mx2/devices.c 2009-03-31 11:00:28.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-mx2/devices.c 2009-03-31 11:26:09.000000000 +0200
-@@ -398,7 +398,7 @@
+--- linux-2.6.29.orig/arch/arm/mach-mx2/devices.c 2009-05-26 15:11:17.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-mx2/devices.c 2009-05-26 15:33:35.000000000 +0200
+@@ -398,7 +398,11 @@
/* mxc lcd driver */
struct platform_device mxc_fb_device = {
- .name = "imx-fb",
-+ .name = "mxc_sdc_fb", /* "imx-fb" if using pengu i.MX1/2/3 driver */
++#ifdef CONFIG_FB_IMX
++ .name = "imx-fb", /* Mainline driver */
++#elif CONFIG_FB_MXC
++ .name = "mxc_sdc_fb", /* Freescale driver */
++#endif
.id = 0,
.num_resources = ARRAY_SIZE(mxc_fb),
.resource = mxc_fb,
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-makes_mainline_driver_selectable_for_mx2.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-makes_mainline_driver_selectable_for_mx2.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-makes_mainline_driver_selectable_for_mx2.patch 2009-05-27 17:59:13 UTC (rev 1310)
@@ -0,0 +1,13 @@
+Index: linux-2.6.29/drivers/video/Kconfig
+===================================================================
+--- linux-2.6.29.orig/drivers/video/Kconfig 2009-05-26 15:39:19.000000000 +0200
++++ linux-2.6.29/drivers/video/Kconfig 2009-05-26 15:40:54.000000000 +0200
+@@ -398,7 +398,7 @@
+
+ config FB_IMX
+ tristate "Motorola i.MX LCD support"
+- depends on FB && ARM && ARCH_IMX
++ depends on FB && ARM && (ARCH_IMX || ARCH_MX2)
+ select FB_CFB_FILLRECT
+ select FB_CFB_COPYAREA
+ select FB_CFB_IMAGEBLIT
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/333-armadeus-imxfb-makes_plat-mxc_imxfb_h_compatible_with_mx27.patch 2009-05-27 17:59:13 UTC (rev 1310)
@@ -0,0 +1,33 @@
+
+On i.MX27 (and probably i.MX21) bits per pixel selection in LCD controller
+is slightly different than on i.MXL.
+So makes some changes in MX1/2 framebuffer driver include...
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 11:43:17.000000000 +0200
++++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 11:49:26.000000000 +0200
+@@ -13,7 +13,12 @@
+ #define PCR_BPIX_4 (2 << 25)
+ #define PCR_BPIX_8 (3 << 25)
+ #define PCR_BPIX_12 (4 << 25)
++#ifdef CONFIG_ARCH_MX1
+ #define PCR_BPIX_16 (4 << 25)
++#else
++#define PCR_BPIX_16 (5 << 25)
++#define PCR_BPIX_18 (6 << 25)
++#endif
+ #define PCR_BPIX_MASK (7 << 25)
+ #define PCR_PIXPOL (1 << 24)
+ #define PCR_FLMPOL (1 << 23)
+@@ -22,7 +27,7 @@
+ #define PCR_OEPOL (1 << 20)
+ #define PCR_SCLKIDLE (1 << 19)
+ #define PCR_END_SEL (1 << 18)
+-#define PCR_END_BYTE_SWAP ( 1<< 17)
++#define PCR_END_BYTE_SWAP (1 << 17)
+ #define PCR_REV_VS (1 << 16)
+ #define PCR_ACD_SEL (1 << 15)
+ #define PCR_ACD(x) (((x) & 0x7f) << 8)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-05-27 17:52:46
|
Revision: 1309
http://armadeus.svn.sourceforge.net/armadeus/?rev=1309&view=rev
Author: artemys
Date: 2009-05-27 17:52:14 +0000 (Wed, 27 May 2009)
Log Message:
-----------
[LINUX] Add clock support in imxfb (2.6.29)
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-add_clock_support.patch
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-add_clock_support.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-add_clock_support.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-add_clock_support.patch 2009-05-27 17:52:14 UTC (rev 1309)
@@ -0,0 +1,125 @@
+From: Sascha Hauer <s....@pe...>
+Date: Thu, 15 Jan 2009 14:21:00 +0000 (+0100)
+Subject: imxfb: add clock support
+X-Git-Url: http://git.pengutronix.de/?p=imx%2Flinux-2.6.git;a=commitdiff_plain;h=f909ef6437a8388e3f1272c67ee29071f930bd6b
+
+imxfb: add clock support
+
+v2: Added change from Martin Fuzzey: pixclock should be in pico seconds
+ instead of MHz.
+
+JB: modified to hardcode LCD clock name (until 2.6.3x)
+
+Signed-off-by: Sascha Hauer <s....@pe...>
+---
+
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-27 09:33:59.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 10:28:58.000000000 +0200
+@@ -27,9 +27,11 @@
+ #include <linux/init.h>
+ #include <linux/ioport.h>
+ #include <linux/cpufreq.h>
++#include <linux/clk.h>
+ #include <linux/platform_device.h>
+ #include <linux/dma-mapping.h>
+ #include <linux/io.h>
++#include <linux/math64.h>
+
+ #include <mach/imxfb.h>
+
+@@ -142,6 +144,7 @@
+ struct imxfb_info {
+ struct platform_device *pdev;
+ void __iomem *regs;
++ struct clk *clk;
+
+ u_int max_bpp;
+ u_int max_xres;
+@@ -392,6 +395,8 @@
+
+ writel(RMCR_LCDC_EN, fbi->regs + LCDC_RMCR);
+
++ clk_enable(fbi->clk);
++
+ if (fbi->backlight_power)
+ fbi->backlight_power(1);
+ if (fbi->lcd_power)
+@@ -407,6 +412,8 @@
+ if (fbi->lcd_power)
+ fbi->lcd_power(0);
+
++ clk_disable(fbi->clk);
++
+ writel(0, fbi->regs + LCDC_RMCR);
+ }
+
+@@ -450,6 +457,9 @@
+ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *info)
+ {
+ struct imxfb_info *fbi = info->par;
++ unsigned int pcr, lcd_clk;
++ unsigned long long tmp;
++
+ pr_debug("var: xres=%d hslen=%d lm=%d rm=%d\n",
+ var->xres, var->hsync_len,
+ var->left_margin, var->right_margin);
+@@ -496,7 +506,23 @@
+
+ writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
+ fbi->regs + LCDC_SIZE);
+- writel(fbi->pcr, fbi->regs + LCDC_PCR);
++
++ lcd_clk = clk_get_rate(fbi->clk);
++ tmp = var->pixclock * (unsigned long long)lcd_clk;
++ do_div(tmp, 1000000);
++ if (do_div(tmp, 1000000) > 500000)
++ tmp++;
++ pcr = (unsigned int)tmp;
++ if (--pcr > 0x3F) {
++ pcr = 0x3F;
++ printk(KERN_WARNING "Must limit pixel clock to %uHz\n",
++ lcd_clk / pcr);
++ }
++
++ /* add sync polarities */
++ pcr |= fbi->pcr & ~0x3F;
++
++ writel(pcr, fbi->regs + LCDC_PCR);
+ writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
+ writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
+ writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
+@@ -638,6 +664,13 @@
+ goto failed_req;
+ }
+
++ fbi->clk = clk_get(&pdev->dev, "lcdc_clk");
++ if (IS_ERR(fbi->clk)) {
++ ret = PTR_ERR(fbi->clk);;
++ dev_err(&pdev->dev, "unable to get clock: %d\n", ret);
++ goto failed_getclock;
++ }
++
+ fbi->regs = ioremap(res->start, resource_size(res));
+ if (fbi->regs == NULL) {
+ printk(KERN_ERR"Cannot map frame buffer registers\n");
+@@ -706,6 +739,8 @@
+ dma_free_writecombine(&pdev->dev,fbi->map_size,fbi->map_cpu,
+ fbi->map_dma);
+ failed_map:
++ clk_put(fbi->clk);
++failed_getclock:
+ iounmap(fbi->regs);
+ failed_ioremap:
+ release_mem_region(res->start, res->end - res->start);
+@@ -740,6 +775,9 @@
+
+ iounmap(fbi->regs);
+ release_mem_region(res->start, res->end - res->start + 1);
++ clk_disable(fbi->clk);
++ clk_put(fbi->clk);
++
+ platform_set_drvdata(pdev, NULL);
+
+ return 0;
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch 2009-05-26 17:48:59 UTC (rev 1308)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch 2009-05-27 17:52:14 UTC (rev 1309)
@@ -9,9 +9,9 @@
Index: linux-2.6.29/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:35:11.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 19:37:20.000000000 +0200
-@@ -456,6 +456,7 @@
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:52:35.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 09:14:31.000000000 +0200
+@@ -466,6 +466,7 @@
pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
var->yres, var->vsync_len,
var->upper_margin, var->lower_margin);
@@ -19,17 +19,17 @@
#if DEBUG_VAR
if (var->xres < 16 || var->xres > 1024)
-@@ -497,9 +498,6 @@
- writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
- fbi->regs + LCDC_SIZE);
- writel(fbi->pcr, fbi->regs + LCDC_PCR);
+@@ -523,9 +524,6 @@
+ pcr |= fbi->pcr & ~0x3F;
+
+ writel(pcr, fbi->regs + LCDC_PCR);
- writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
- writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
- writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
return 0;
}
-@@ -686,6 +684,12 @@
+@@ -719,6 +717,12 @@
goto failed_cmap;
imxfb_set_par(info);
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-26 17:48:59 UTC (rev 1308)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-27 17:52:14 UTC (rev 1309)
@@ -8,8 +8,8 @@
Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 16:45:13.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 16:59:42.000000000 +0200
+--- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 19:52:33.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-27 09:15:52.000000000 +0200
@@ -14,6 +14,7 @@
#define PCR_BPIX_8 (3 << 25)
#define PCR_BPIX_12 (4 << 25)
@@ -20,8 +20,8 @@
#define PCR_LPPOL (1 << 22)
Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
===================================================================
---- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 16:58:36.000000000 +0200
-+++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 16:59:23.000000000 +0200
+--- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 19:52:35.000000000 +0200
++++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-27 09:15:52.000000000 +0200
@@ -14,6 +14,7 @@
#define PCR_BPIX_8 (3 << 25)
#define PCR_BPIX_12 (4 << 25)
@@ -32,23 +32,22 @@
#define PCR_LPPOL (1 << 22)
Index: linux-2.6.29/drivers/video/imxfb.c
===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 16:45:14.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 16:57:31.000000000 +0200
-@@ -497,7 +497,18 @@
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-27 09:15:03.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-27 09:19:32.000000000 +0200
+@@ -523,7 +523,17 @@
+ /* add sync polarities */
+ pcr |= fbi->pcr & ~0x3F;
- writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
- fbi->regs + LCDC_SIZE);
-- writel(fbi->pcr, fbi->regs + LCDC_PCR);
-+
+- writel(pcr, fbi->regs + LCDC_PCR);
+ /* i.MX LCD controller can support 8bpp even if configured to output 16 bits (TFT) */
+ if ((var->bits_per_pixel == 8) && (fbi->pcr & PCR_TFT)) {
+ pr_debug("Switching imxfb to 8bpp\n");
-+ writel((fbi->pcr & (~PCR_BPIX_MASK)) |
++ writel((pcr & (~PCR_BPIX_MASK)) |
+ PCR_BPIX_8 |
+ PCR_END_BYTE_SWAP,
+ fbi->regs + LCDC_PCR);
+ } else {
-+ writel(fbi->pcr, fbi->regs + LCDC_PCR);
++ writel(pcr, fbi->regs + LCDC_PCR);
+ }
+ writel(VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4), fbi->regs + LCDC_VPW);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-05-26 17:49:08
|
Revision: 1308
http://armadeus.svn.sourceforge.net/armadeus/?rev=1308&view=rev
Author: artemys
Date: 2009-05-26 17:48:59 +0000 (Tue, 26 May 2009)
Log Message:
-----------
[LINUX] Renames/reorganizes some framebuffer related patches
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-pengu-imxfb-fix_margin_settings.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/326-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-fix_margin_settings.patch
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch 2009-05-26 16:35:12 UTC (rev 1307)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -1,44 +0,0 @@
-PWMR, LSCR1 and DMACR registers only need to be initialized once at startup,
-not every time imxfb_set_par()/imxfb_activate_var() are called (for example
-when using SDL).
-Setting these registers in imxfb_set_par()/imxfb_activate_var() has the side
-effect (for example) of shutting down the backlight when opening an 8bits
-SDL screen.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.29/drivers/video/imxfb.c
-===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-20 14:58:44.000000000 +0200
-@@ -437,6 +437,7 @@
- pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
- var->yres, var->vsync_len,
- var->upper_margin, var->lower_margin);
-+ pr_debug("var: bpp=%d\n", var->bits_per_pixel);
-
- #if DEBUG_VAR
- if (var->xres < 16 || var->xres > 1024)
-@@ -478,9 +479,6 @@
- writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
- fbi->regs + LCDC_SIZE);
- writel(fbi->pcr, fbi->regs + LCDC_PCR);
-- writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
-- writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
-- writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
-
- return 0;
- }
-@@ -661,6 +659,12 @@
- goto failed_cmap;
-
- imxfb_set_par(info);
-+ /* JB: The following parameters are only needed once at startup and so
-+ removed from from imxfb_set_par()/imxfb_activate_var() */
-+ writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
-+ writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
-+ writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
-+
- ret = register_framebuffer(info);
- if (ret < 0) {
- dev_err(&pdev->dev, "failed to register framebuffer\n");
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/326-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/326-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch 2009-05-26 16:35:12 UTC (rev 1307)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/326-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -1,24 +0,0 @@
-On most LCDs (at least Sharp's one) LCD logic needs to be activated before
-powering on the backlight, otherwise some display's startup artefacts
-will be seen.
-
-Signed-off-by: Nicolas Colombain <nic...@ar...>
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.29/drivers/video/imxfb.c
-===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-20 14:40:14.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-20 14:40:14.000000000 +0200
-@@ -373,10 +373,10 @@
-
- writel(RMCR_LCDC_EN, fbi->regs + LCDC_RMCR);
-
-- if (fbi->backlight_power)
-- fbi->backlight_power(1);
- if (fbi->lcd_power)
- fbi->lcd_power(1);
-+ if (fbi->backlight_power)
-+ fbi->backlight_power(1);
- }
-
- static void imxfb_disable_controller(struct imxfb_info *fbi)
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-26 16:35:12 UTC (rev 1307)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -1,56 +0,0 @@
-
-When configured with a TFT LCD interface i.MX(1/2) LCD controller can support
-16, 12, 8 & 4bpp framebuffers with the same hardware interface (12 to 16 bits).
-So if userspace app wants a 8bpp screen, we switch to 8bpp. This can save
-ressources (mem + proc), when using SDL for example.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
-===================================================================
---- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 16:45:13.000000000 +0200
-+++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 16:59:42.000000000 +0200
-@@ -14,6 +14,7 @@
- #define PCR_BPIX_8 (3 << 25)
- #define PCR_BPIX_12 (4 << 25)
- #define PCR_BPIX_16 (4 << 25)
-+#define PCR_BPIX_MASK (7 << 25)
- #define PCR_PIXPOL (1 << 24)
- #define PCR_FLMPOL (1 << 23)
- #define PCR_LPPOL (1 << 22)
-Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
-===================================================================
---- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 16:58:36.000000000 +0200
-+++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 16:59:23.000000000 +0200
-@@ -14,6 +14,7 @@
- #define PCR_BPIX_8 (3 << 25)
- #define PCR_BPIX_12 (4 << 25)
- #define PCR_BPIX_16 (4 << 25)
-+#define PCR_BPIX_MASK (7 << 25)
- #define PCR_PIXPOL (1 << 24)
- #define PCR_FLMPOL (1 << 23)
- #define PCR_LPPOL (1 << 22)
-Index: linux-2.6.29/drivers/video/imxfb.c
-===================================================================
---- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 16:45:14.000000000 +0200
-+++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 16:57:31.000000000 +0200
-@@ -497,7 +497,18 @@
-
- writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
- fbi->regs + LCDC_SIZE);
-- writel(fbi->pcr, fbi->regs + LCDC_PCR);
-+
-+ /* i.MX LCD controller can support 8bpp even if configured to output 16 bits (TFT) */
-+ if ((var->bits_per_pixel == 8) && (fbi->pcr & PCR_TFT)) {
-+ pr_debug("Switching imxfb to 8bpp\n");
-+ writel((fbi->pcr & (~PCR_BPIX_MASK)) |
-+ PCR_BPIX_8 |
-+ PCR_END_BYTE_SWAP,
-+ fbi->regs + LCDC_PCR);
-+ } else {
-+ writel(fbi->pcr, fbi->regs + LCDC_PCR);
-+ }
-+ writel(VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4), fbi->regs + LCDC_VPW);
-
- return 0;
- }
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-pengu-imxfb-fix_margin_settings.patch (from rev 1305, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-fix_margin_settings.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-pengu-imxfb-fix_margin_settings.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-pengu-imxfb-fix_margin_settings.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -0,0 +1,31 @@
+From: Sascha Hauer <s....@pe...>
+Date: Sat, 14 Feb 2009 15:29:38 +0000 (+0100)
+Subject: imxfb: Fix margin settings
+X-Git-Tag: v2.6.30-rc1~636^2~29^2~17
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7e8549bcee00d92040904361cb1840c7a5eda615
+
+imxfb: Fix margin settings
+
+The var->hsync_len, var->right_margin and var->left_margin fields
+should contain the real values, not the hardware dependent values.
+
+Signed-off-by: Sascha Hauer <s....@pe...>
+---
+
+diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
+index 9dd2757..bd1cb75 100644
+--- a/drivers/video/imxfb.c
++++ b/drivers/video/imxfb.c
+@@ -495,9 +495,9 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
+ info->fix.id, var->lower_margin);
+ #endif
+
+- writel(HCR_H_WIDTH(var->hsync_len) |
+- HCR_H_WAIT_1(var->right_margin) |
+- HCR_H_WAIT_2(var->left_margin),
++ writel(HCR_H_WIDTH(var->hsync_len - 1) |
++ HCR_H_WAIT_1(var->right_margin - 1) |
++ HCR_H_WAIT_2(var->left_margin - 3),
+ fbi->regs + LCDC_HCR);
+
+ writel(VCR_V_WIDTH(var->vsync_len) |
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-pengu-imxfb-fix_margin_settings.patch
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-fix_margin_settings.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-fix_margin_settings.patch 2009-05-26 16:35:12 UTC (rev 1307)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/328-pengu-imxfb-fix_margin_settings.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -1,31 +0,0 @@
-From: Sascha Hauer <s....@pe...>
-Date: Sat, 14 Feb 2009 15:29:38 +0000 (+0100)
-Subject: imxfb: Fix margin settings
-X-Git-Tag: v2.6.30-rc1~636^2~29^2~17
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=7e8549bcee00d92040904361cb1840c7a5eda615
-
-imxfb: Fix margin settings
-
-The var->hsync_len, var->right_margin and var->left_margin fields
-should contain the real values, not the hardware dependent values.
-
-Signed-off-by: Sascha Hauer <s....@pe...>
----
-
-diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
-index 9dd2757..bd1cb75 100644
---- a/drivers/video/imxfb.c
-+++ b/drivers/video/imxfb.c
-@@ -495,9 +495,9 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
- info->fix.id, var->lower_margin);
- #endif
-
-- writel(HCR_H_WIDTH(var->hsync_len) |
-- HCR_H_WAIT_1(var->right_margin) |
-- HCR_H_WAIT_2(var->left_margin),
-+ writel(HCR_H_WIDTH(var->hsync_len - 1) |
-+ HCR_H_WAIT_1(var->right_margin - 1) |
-+ HCR_H_WAIT_2(var->left_margin - 3),
- fbi->regs + LCDC_HCR);
-
- writel(VCR_V_WIDTH(var->vsync_len) |
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch (from rev 1305, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/326-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -0,0 +1,24 @@
+On most LCDs (at least Sharp's one) LCD logic needs to be activated before
+powering on the backlight, otherwise some display's startup artefacts
+will be seen.
+
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:35:11.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 19:37:34.000000000 +0200
+@@ -392,10 +392,10 @@
+
+ writel(RMCR_LCDC_EN, fbi->regs + LCDC_RMCR);
+
+- if (fbi->backlight_power)
+- fbi->backlight_power(1);
+ if (fbi->lcd_power)
+ fbi->lcd_power(1);
++ if (fbi->backlight_power)
++ fbi->backlight_power(1);
+ }
+
+ static void imxfb_disable_controller(struct imxfb_info *fbi)
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/330-armadeus-imxfb-power_on_backlight_after_lcd_logic.patch
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch (from rev 1305, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/013-armadeus-imxfb-improvements.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -0,0 +1,44 @@
+PWMR, LSCR1 and DMACR registers only need to be initialized once at startup,
+not every time imxfb_set_par()/imxfb_activate_var() are called (for example
+when using SDL).
+Setting these registers in imxfb_set_par()/imxfb_activate_var() has the side
+effect (for example) of shutting down the backlight when opening an 8bits
+SDL screen.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 19:35:11.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 19:37:20.000000000 +0200
+@@ -456,6 +456,7 @@
+ pr_debug("var: yres=%d vslen=%d um=%d bm=%d\n",
+ var->yres, var->vsync_len,
+ var->upper_margin, var->lower_margin);
++ pr_debug("var: bpp=%d\n", var->bits_per_pixel);
+
+ #if DEBUG_VAR
+ if (var->xres < 16 || var->xres > 1024)
+@@ -497,9 +498,6 @@
+ writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
+ fbi->regs + LCDC_SIZE);
+ writel(fbi->pcr, fbi->regs + LCDC_PCR);
+- writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
+- writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
+- writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
+
+ return 0;
+ }
+@@ -686,6 +684,12 @@
+ goto failed_cmap;
+
+ imxfb_set_par(info);
++ /* JB: The following parameters are only needed once at startup and so
++ removed from from imxfb_set_par()/imxfb_activate_var() */
++ writel(fbi->pwmr, fbi->regs + LCDC_PWMR);
++ writel(fbi->lscr1, fbi->regs + LCDC_LSCR1);
++ writel(fbi->dmacr, fbi->regs + LCDC_DMACR);
++
+ ret = register_framebuffer(info);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "failed to register framebuffer\n");
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/331-armadeus-imxfb-improvements.patch
___________________________________________________________________
Added: svn:mergeinfo
+
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch (from rev 1306, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/327-armadeus-imxfb-supports_8bpp_in_tft_mode.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch 2009-05-26 17:48:59 UTC (rev 1308)
@@ -0,0 +1,56 @@
+
+When configured with a TFT LCD interface i.MX(1/2) LCD controller can support
+16, 12, 8 & 4bpp framebuffers with the same hardware interface (12 to 16 bits).
+So if userspace app wants a 8bpp screen, we switch to 8bpp. This can save
+ressources (mem + proc), when using SDL for example.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 16:45:13.000000000 +0200
++++ linux-2.6.29/arch/arm/mach-imx/include/mach/imxfb.h 2009-05-26 16:59:42.000000000 +0200
+@@ -14,6 +14,7 @@
+ #define PCR_BPIX_8 (3 << 25)
+ #define PCR_BPIX_12 (4 << 25)
+ #define PCR_BPIX_16 (4 << 25)
++#define PCR_BPIX_MASK (7 << 25)
+ #define PCR_PIXPOL (1 << 24)
+ #define PCR_FLMPOL (1 << 23)
+ #define PCR_LPPOL (1 << 22)
+Index: linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h
+===================================================================
+--- linux-2.6.29.orig/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 16:58:36.000000000 +0200
++++ linux-2.6.29/arch/arm/plat-mxc/include/mach/imxfb.h 2009-05-26 16:59:23.000000000 +0200
+@@ -14,6 +14,7 @@
+ #define PCR_BPIX_8 (3 << 25)
+ #define PCR_BPIX_12 (4 << 25)
+ #define PCR_BPIX_16 (4 << 25)
++#define PCR_BPIX_MASK (7 << 25)
+ #define PCR_PIXPOL (1 << 24)
+ #define PCR_FLMPOL (1 << 23)
+ #define PCR_LPPOL (1 << 22)
+Index: linux-2.6.29/drivers/video/imxfb.c
+===================================================================
+--- linux-2.6.29.orig/drivers/video/imxfb.c 2009-05-26 16:45:14.000000000 +0200
++++ linux-2.6.29/drivers/video/imxfb.c 2009-05-26 16:57:31.000000000 +0200
+@@ -497,7 +497,18 @@
+
+ writel(SIZE_XMAX(var->xres) | SIZE_YMAX(var->yres),
+ fbi->regs + LCDC_SIZE);
+- writel(fbi->pcr, fbi->regs + LCDC_PCR);
++
++ /* i.MX LCD controller can support 8bpp even if configured to output 16 bits (TFT) */
++ if ((var->bits_per_pixel == 8) && (fbi->pcr & PCR_TFT)) {
++ pr_debug("Switching imxfb to 8bpp\n");
++ writel((fbi->pcr & (~PCR_BPIX_MASK)) |
++ PCR_BPIX_8 |
++ PCR_END_BYTE_SWAP,
++ fbi->regs + LCDC_PCR);
++ } else {
++ writel(fbi->pcr, fbi->regs + LCDC_PCR);
++ }
++ writel(VPW_VPW(var->xres * var->bits_per_pixel / 8 / 4), fbi->regs + LCDC_VPW);
+
+ return 0;
+ }
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/332-armadeus-imxfb-supports_8bpp_in_tft_mode.patch
___________________________________________________________________
Added: svn:mergeinfo
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ar...@us...> - 2009-05-26 16:35:18
|
Revision: 1307
http://armadeus.svn.sourceforge.net/armadeus/?rev=1307&view=rev
Author: artemys
Date: 2009-05-26 16:35:12 +0000 (Tue, 26 May 2009)
Log Message:
-----------
[LINUX] Add i.MX27 support to mainline framebuffer (part 1)
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-add_mx27_support.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/329-pengu-imxfb-fix_tft_mode_init.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-fix_tft_mode_init.patch
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-add_mx27_support.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-add_mx27_support.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-add_mx27_support.patch 2009-05-26 16:35:12 UTC (rev 1307)
@@ -0,0 +1,82 @@
+From: Sascha Hauer <s....@pe...>
+Date: Mon, 26 Jan 2009 16:29:10 +0000 (+0100)
+Subject: imxfb: add mx27 support
+X-Git-Url: http://git.pengutronix.de/?p=imx%2Flinux-2.6.git;a=commitdiff_plain;h=1d0f98709347c4babac08dd933466674e089f188
+
+imxfb: add mx27 support
+
+Signed-off-by: Sascha Hauer <s....@pe...>
+---
+
+diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
+index 5c61286..9dd2757 100644
+--- a/drivers/video/imxfb.c
++++ b/drivers/video/imxfb.c
+@@ -43,7 +43,12 @@
+
+ #define LCDC_SIZE 0x04
+ #define SIZE_XMAX(x) ((((x) >> 4) & 0x3f) << 20)
++
++#ifdef CONFIG_ARCH_MX1
+ #define SIZE_YMAX(y) ((y) & 0x1ff)
++#else
++#define SIZE_YMAX(y) ((y) & 0x3ff)
++#endif
+
+ #define LCDC_VPW 0x08
+ #define VPW_VPW(x) ((x) & 0x3ff)
+@@ -53,7 +58,12 @@
+ #define CPOS_CC0 (1<<30)
+ #define CPOS_OP (1<<28)
+ #define CPOS_CXP(x) (((x) & 3ff) << 16)
++
++#ifdef CONFIG_ARCH_MX1
+ #define CPOS_CYP(y) ((y) & 0x1ff)
++#else
++#define CPOS_CYP(y) ((y) & 0x3ff)
++#endif
+
+ #define LCDC_LCWHB 0x10
+ #define LCWHB_BK_EN (1<<31)
+@@ -62,9 +72,16 @@
+ #define LCWHB_BD(x) ((x) & 0xff)
+
+ #define LCDC_LCHCC 0x14
++
++#ifdef CONFIG_ARCH_MX1
+ #define LCHCC_CUR_COL_R(r) (((r) & 0x1f) << 11)
+ #define LCHCC_CUR_COL_G(g) (((g) & 0x3f) << 5)
+ #define LCHCC_CUR_COL_B(b) ((b) & 0x1f)
++#else
++#define LCHCC_CUR_COL_R(r) (((r) & 0x3f) << 12)
++#define LCHCC_CUR_COL_G(g) (((g) & 0x3f) << 6)
++#define LCHCC_CUR_COL_B(b) ((b) & 0x3f)
++#endif
+
+ #define LCDC_PCR 0x18
+
+@@ -91,7 +108,13 @@
+ /* bit fields in imxfb.h */
+
+ #define LCDC_RMCR 0x34
++
++#ifdef CONFIG_ARCH_MX1
+ #define RMCR_LCDC_EN (1<<1)
++#else
++#define RMCR_LCDC_EN 0
++#endif
++
+ #define RMCR_SELF_REF (1<<0)
+
+ #define LCDC_LCDICR 0x38
+@@ -365,10 +388,6 @@ static void imxfb_enable_controller(struct imxfb_info *fbi)
+ {
+ pr_debug("Enabling LCD controller\n");
+
+- /* initialize LCDC */
+- writel(readl(fbi->regs + LCDC_RMCR) & ~RMCR_LCDC_EN,
+- fbi->regs + LCDC_RMCR); /* just to be safe... */
+-
+ writel(fbi->screen_dma, fbi->regs + LCDC_SSA);
+
+ /* physical screen start address */
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-fix_tft_mode_init.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-fix_tft_mode_init.patch 2009-05-26 16:29:54 UTC (rev 1306)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-fix_tft_mode_init.patch 2009-05-26 16:35:12 UTC (rev 1307)
@@ -1,28 +0,0 @@
-From: Sascha Hauer <s....@pe...>
-Date: Thu, 26 Mar 2009 11:38:26 +0000 (+0100)
-Subject: imxfb: Fix TFT mode
-X-Git-Tag: v2.6.30-rc1~636^2~3^2
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4d1e4e5a6387aad97590e2da9c6db1350f22f63a
-
-imxfb: Fix TFT mode
-
-We read from the PCR reg to determine whether to use TFT mode or not.
-This is not possible because it may not have been initialized with
-the correct value yet. Select it using fbi->pcr instead.
-
-Signed-off-by: Sascha Hauer <s....@pe...>
----
-
-diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
-index 8f7a2b2..15a0ee6 100644
---- a/drivers/video/imxfb.c
-+++ b/drivers/video/imxfb.c
-@@ -327,7 +327,7 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
- break;
- case 16:
- default:
-- if (readl(fbi->regs + LCDC_PCR) & PCR_TFT)
-+ if (fbi->pcr & PCR_TFT)
- rgb = &def_rgb_16_tft;
- else
- rgb = &def_rgb_16_stn;
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/329-pengu-imxfb-fix_tft_mode_init.patch (from rev 1304, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-fix_tft_mode_init.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/329-pengu-imxfb-fix_tft_mode_init.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/329-pengu-imxfb-fix_tft_mode_init.patch 2009-05-26 16:35:12 UTC (rev 1307)
@@ -0,0 +1,28 @@
+From: Sascha Hauer <s....@pe...>
+Date: Thu, 26 Mar 2009 11:38:26 +0000 (+0100)
+Subject: imxfb: Fix TFT mode
+X-Git-Tag: v2.6.30-rc1~636^2~3^2
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4d1e4e5a6387aad97590e2da9c6db1350f22f63a
+
+imxfb: Fix TFT mode
+
+We read from the PCR reg to determine whether to use TFT mode or not.
+This is not possible because it may not have been initialized with
+the correct value yet. Select it using fbi->pcr instead.
+
+Signed-off-by: Sascha Hauer <s....@pe...>
+---
+
+diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
+index 8f7a2b2..15a0ee6 100644
+--- a/drivers/video/imxfb.c
++++ b/drivers/video/imxfb.c
+@@ -327,7 +327,7 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+ break;
+ case 16:
+ default:
+- if (readl(fbi->regs + LCDC_PCR) & PCR_TFT)
++ if (fbi->pcr & PCR_TFT)
+ rgb = &def_rgb_16_tft;
+ else
+ rgb = &def_rgb_16_stn;
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/329-pengu-imxfb-fix_tft_mode_init.patch
___________________________________________________________________
Added: svn:mergeinfo
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
