Menu
▾
▴
[Hackndev-commit] SF.net SVN: hackndev: [964] linux4palm/linux/trunk
|
From: <mar...@us...> - 2007-05-01 15:31:46
|
Revision: 964
http://svn.sourceforge.net/hackndev/?rev=964&view=rev
Author: marex_z71
Date: 2007-05-01 08:31:44 -0700 (Tue, 01 May 2007)
Log Message:
-----------
l4p: fix what previous commit screwed, make a few things look better
Modified Paths:
--------------
linux4palm/linux/trunk/Makefile
linux4palm/linux/trunk/arch/arm/mach-pxa/palmt650/palmt650.c
linux4palm/linux/trunk/drivers/misc/Kconfig
linux4palm/linux/trunk/drivers/misc/Makefile
linux4palm/linux/trunk/drivers/video/logo/Makefile
Modified: linux4palm/linux/trunk/Makefile
===================================================================
--- linux4palm/linux/trunk/Makefile 2007-05-01 14:43:07 UTC (rev 963)
+++ linux4palm/linux/trunk/Makefile 2007-05-01 15:31:44 UTC (rev 964)
@@ -183,7 +183,7 @@
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
ARCH := arm
-CROSS_COMPILE ?= arm-none-eabi-
+CROSS_COMPILE ?= arm-softfloat-linux-gnu-
# Architecture as present in compile.h
UTS_MACHINE := $(ARCH)
Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmt650/palmt650.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmt650/palmt650.c 2007-05-01 14:43:07 UTC (rev 963)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmt650/palmt650.c 2007-05-01 15:31:44 UTC (rev 964)
@@ -149,7 +149,8 @@
static int udc_is_connected(void)
{
- return 1111;//GPLR(GPIO_PALMLD_USB_DETECT) & GPIO_bit(GPIO_PALMLD_USB_DETECT);
+ return 1111; /* GPLR(GPIO_PALMLD_USB_DETECT) &
+ GPIO_bit(GPIO_PALMLD_USB_DETECT); */
}
static void udc_enable(int cmd)
@@ -184,69 +185,69 @@
.nr_cols = 7,
.keycodes = {
{ /* row 0 */
- KEY_O, // "O"
- KEY_DOWN, // "5-Way Left" },
- -1, // "Alternate" },
- KEY_L, // "L" },
- KEY_A, // "A" },
- KEY_Q, // "Q" },
- KEY_RIGHTCTRL, // "Right Shift" },
+ KEY_O, /* "O" */
+ KEY_DOWN, /* "5-Way Left" */
+ -1, /* "Alternate" */
+ KEY_L, /* "L" */
+ KEY_A, /* "A" */
+ KEY_Q, /* "Q" */
+ KEY_RIGHTCTRL, /* "Right Shift" */
}, { /* row 1 */
- KEY_P, // "P" },
- KEY_UP, // "5-Way Right" },
- KEY_LEFTSHIFT, //"Left Shift" },
- KEY_Z, // "Z" },
- KEY_S, // "S" },
- KEY_W, // "W" },
- -1, // "Unused" },
+ KEY_P, /* "P" */
+ KEY_UP, /* "5-Way Right" */
+ KEY_LEFTSHIFT, /* "Left Shift" */
+ KEY_Z, /* "Z" */
+ KEY_S, /* "S" */
+ KEY_W, /* "W" */
+ -1, /* "Unused" */
}, { /* row 2 */
- -1, // "Phone" },
- KEY_LEFT, // "5-Way Up" },
- KEY_0, // "0" },
- KEY_X, // "X" },
- KEY_D, // "D" },
- KEY_E, // "E" },
- -1, // "Unused" },
+ -1, /* "Phone" */
+ KEY_LEFT, /* "5-Way Up" */
+ KEY_0, /* "0" */
+ KEY_X, /* "X" */
+ KEY_D, /* "D" */
+ KEY_E, /* "E" */
+ -1, /* "Unused" */
}, { /* row 3 */
- KEY_F10, // "Calendar" },
- KEY_RIGHT, // "5-Way Down" },
- KEY_SPACE, // "Space" },
- KEY_C, // "C" },
- KEY_F, // "F" },
- KEY_R, // "R" },
- -1, // "Unused" },
+ KEY_F10, /* "Calendar" */
+ KEY_RIGHT, /* "5-Way Down" */
+ KEY_SPACE, /* "Space" */
+ KEY_C, /* "C" */
+ KEY_F, /* "F" */
+ KEY_R, /* "R" */
+ -1, /* "Unused" */
}, { /* row 4 */
- KEY_F12, // "Mail" },
- KEY_ENTER, // "5-Way Center" },
- KEY_F9, // "HOME" },
- KEY_V, // "V" },
- KEY_G, // "G" },
- KEY_T, // "T" },
- -1, // "Unused" },
+ KEY_F12, /* "Mail" */
+ KEY_ENTER, /* "5-Way Center" */
+ KEY_F9, /* "HOME" */
+ KEY_V, /* "V" */
+ KEY_G, /* "G" */
+ KEY_T, /* "T" */
+ -1, /* "Unused" */
}, { /* row 5 */
- -1, // "Off" },
- KEY_VOLUMEUP, // "Volume Up" },
- KEY_DOT, // "." },
- KEY_B, // "B" },
- KEY_H, // "H" },
- KEY_Y, // "Y" },
- -1, // "Unused" },
+ -1, /* "Off" */
+ KEY_VOLUMEUP, /* "Volume Up" */
+ KEY_DOT, /* "." */
+ KEY_B, /* "B" */
+ KEY_H, /* "H" */
+ KEY_Y, /* "Y" */
+ -1, /* "Unused" */
}, { /* row 6 */
- KEY_F11, // "Mute" },
- KEY_VOLUMEDOWN, // "Volume Down" },
- KEY_ENTER, // "Return" },
- KEY_N, // "N" },
- KEY_J, // "J" },
- KEY_U, // "U" },
- -1, // "Unused" },
+ KEY_F11, /* "Mute" */
+ KEY_VOLUMEDOWN, /* "Volume Down" */
+ KEY_ENTER, /* "Return" */
+ KEY_N, /* "N" */
+ KEY_J, /* "J" */
+ KEY_U, /* "U" */
+ -1, /* "Unused" */
}, { /* row 7 */
- KEY_RIGHTALT, // "Alt" },
- -1, // "Unused" },
- KEY_BACKSPACE, // "P" },
- KEY_M, // "M"
- KEY_K, // "K"
- KEY_I, // "I"
- -1, // "Unused" },
+ KEY_RIGHTALT, /* "Alt" */
+ -1, /* "Unused" */
+ KEY_BACKSPACE, /* "P" */
+ KEY_M, /* "M"*/
+ KEY_K, /* "K"*/
+ KEY_I, /* "I"*/
+ -1, /* "Unused" */
},
},
@@ -299,8 +300,8 @@
.vsync_len = 1,
/* fixme: these are the margins PalmOS has set,
- * they seem to work but could be better.
- */
+ * they seem to work but could be better.
+ */
.left_margin = 20,
.right_margin = 8,
.upper_margin = 8,
@@ -311,9 +312,9 @@
static struct pxafb_mach_info palmt650_lcd __initdata = {
.lccr0 = 0x4000080,
.lccr3 = 0x4700003,
- //.pxafb_backlight_power = palm_backlight_power,
- //
- //
+
+ /* .pxafb_backlight_power = palm_backlight_power, */
+
.num_modes = 1,
.modes = &palmt650_lcd_mode,
};
@@ -343,8 +344,8 @@
pxa_set_udc_info( &palmt650_udc_mach_info );
platform_add_devices(devices, ARRAY_SIZE(devices));
+#if 0
/* configure power switch to resume from standby */
-#if 0
PWER |= PWER_GPIO12;
PRER |= PWER_GPIO12;
#endif
Modified: linux4palm/linux/trunk/drivers/misc/Kconfig
===================================================================
--- linux4palm/linux/trunk/drivers/misc/Kconfig 2007-05-01 14:43:07 UTC (rev 963)
+++ linux4palm/linux/trunk/drivers/misc/Kconfig 2007-05-01 15:31:44 UTC (rev 964)
@@ -34,13 +34,6 @@
Say Y here to enable monitoring of battery and charger using
sysfs interface.
-config ASIC6ED
- tristate "ASIC6ED"
- depends on ARCH_PXA
- default n
- help
- ASIC6 register editor, only for debugging or testing!!!
-
config GPIOED
tristate "GPIOED"
depends on ARCH_PXA
Modified: linux4palm/linux/trunk/drivers/misc/Makefile
===================================================================
--- linux4palm/linux/trunk/drivers/misc/Makefile 2007-05-01 14:43:07 UTC (rev 963)
+++ linux4palm/linux/trunk/drivers/misc/Makefile 2007-05-01 15:31:44 UTC (rev 964)
@@ -15,7 +15,6 @@
obj-$(CONFIG_BATTCHARGE_MONITOR) += battchargemon.o
obj-$(CONFIG_GPIOED) += gpioed.o
obj-$(CONFIG_GPIOEDNG) += gpioed-ng.o
-obj-$(CONFIG_ASIC6ED) += asic6ed.o
obj-$(CONFIG_MCP) += mcp-core.o
obj-$(CONFIG_MCP_SA1100) += mcp-sa1100.o
Modified: linux4palm/linux/trunk/drivers/video/logo/Makefile
===================================================================
--- linux4palm/linux/trunk/drivers/video/logo/Makefile 2007-05-01 14:43:07 UTC (rev 963)
+++ linux4palm/linux/trunk/drivers/video/logo/Makefile 2007-05-01 15:31:44 UTC (rev 964)
@@ -13,6 +13,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
+
# How to generate logo's
# Use logo-cfiles to retrieve list of .c files to be built
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
