diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-07-27 09:56:00 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-27 09:56:00 +0000 |
commit | 7b5782831b4e24c01d7f6924969f05d0251000e5 (patch) | |
tree | 950fe06d6457a072e82a3c9c2812e3761b17bb28 /packages | |
parent | 396d884f7b7f3b30746c198451e7289c06101ecc (diff) | |
parent | 98a74f5181a08818ed7bd791d5361ddc53a848d2 (diff) |
merge of cd42ec314bd37793cf241d63236ff65f5851c99e
and ec21bc325dc1d1e889b34a10304e189b8f8bc6fc
Diffstat (limited to 'packages')
5 files changed, 6 insertions, 7 deletions
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb index a3363d824f..65e01a18f7 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb @@ -53,9 +53,8 @@ inherit kernel # # Create the kernel command line. CMDLINE_CONSOLE is set through kernel.oeclass. # -CMDLINE_MTDPARTS_spitz = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home) EQUIPMENT=0" -CMDLINE_MTDPARTS_akita = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=4" - +CMDLINE_MTDPARTS_spitz = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home) EQUIPMENT=4 RTC_RESET=1" +CMDLINE_MTDPARTS_akita = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=0" CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q" # CMDLINE_INIT = "init=/bin/busybox ash" CMDLINE_INIT = " " diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf index 3740bfc351..e9922e4d86 100644 --- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf @@ -15,7 +15,7 @@ ButtonText = #000000 Decoration = libliquid.so Highlight = #52719c HighlightedText = #ffffff -Style = libphasestyle.so +Style = Windows Text = #000000 TabStyle = 1 [InputMethod] diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf index 3740bfc351..e9922e4d86 100644 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf @@ -15,7 +15,7 @@ ButtonText = #000000 Decoration = libliquid.so Highlight = #52719c HighlightedText = #ffffff -Style = libphasestyle.so +Style = Windows Text = #000000 TabStyle = 1 [InputMethod] diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf index 3740bfc351..e9922e4d86 100644 --- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf @@ -15,7 +15,7 @@ ButtonText = #000000 Decoration = libliquid.so Highlight = #52719c HighlightedText = #ffffff -Style = libphasestyle.so +Style = Windows Text = #000000 TabStyle = 1 [InputMethod] diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf index 3740bfc351..e9922e4d86 100644 --- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf +++ b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf @@ -15,7 +15,7 @@ ButtonText = #000000 Decoration = libliquid.so Highlight = #52719c HighlightedText = #ffffff -Style = libphasestyle.so +Style = Windows Text = #000000 TabStyle = 1 [InputMethod] |