From 286fabb636e8ea9eefefe16714ad0b08da5e7fce Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 20:27:31 +0000 Subject: opie-packagemanager 1.2.2 remove patch for recursive wget; applied upstream --- .../opie-packagemanager-1.2.1/.mtn2git_empty | 0 .../0114_opie-pm-recursive-verbose_wget.diff | 123 --------------------- .../opie-packagemanager_1.2.2.bb | 3 +- 3 files changed, 1 insertion(+), 125 deletions(-) delete mode 100644 packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff diff --git a/packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty b/packages/opie-packagemanager/opie-packagemanager-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff b/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff deleted file mode 100644 index 37b4b9bc13..0000000000 --- a/packages/opie-packagemanager/opie-packagemanager-1.2.1/0114_opie-pm-recursive-verbose_wget.diff +++ /dev/null @@ -1,123 +0,0 @@ -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.cpp,v -retrieving revision 1.23 -diff -u -u -r1.23 oipkg.cpp ---- packagemanager/oipkg.cpp 5 Jun 2005 22:18:10 -0000 1.23 -+++ packagemanager/oipkg.cpp 14 Jan 2006 12:10:24 -0000 -@@ -422,6 +422,8 @@ - m_ipkgArgs.force_reinstall = ( m_ipkgExecOptions & FORCE_REINSTALL ); - // TODO m_ipkgArgs.force_remove = ( m_ipkgExecOptions & FORCE_REMOVE ); - m_ipkgArgs.force_overwrite = ( m_ipkgExecOptions & FORCE_OVERWRITE ); -+ m_ipkgArgs.force_removal_of_dependent_packages = ( m_ipkgExecOptions & FORCE_RECURSIVE ); -+ m_ipkgArgs.verbose_wget = ( m_ipkgExecOptions & FORCE_VERBOSE_WGET ); - m_ipkgArgs.verbosity = m_ipkgExecVerbosity; - if ( m_ipkgArgs.dest ) - free( m_ipkgArgs.dest ); -Index: oipkg.h -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkg.h,v -retrieving revision 1.8 -diff -u -u -r1.8 oipkg.h ---- packagemanager/oipkg.h 5 Jun 2005 22:18:10 -0000 1.8 -+++ packagemanager/oipkg.h 14 Jan 2006 12:10:24 -0000 -@@ -43,6 +43,8 @@ - #define FORCE_REMOVE 0x0002 - #define FORCE_REINSTALL 0x0004 - #define FORCE_OVERWRITE 0x0008 -+#define FORCE_RECURSIVE 0x0010 -+#define FORCE_VERBOSE_WGET 0x0020 - - class OConfItemList; - -Index: oipkgconfigdlg.cpp -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkgconfigdlg.cpp,v -retrieving revision 1.20 -diff -u -u -r1.20 oipkgconfigdlg.cpp ---- packagemanager/oipkgconfigdlg.cpp 5 Jun 2005 22:41:15 -0000 1.20 -+++ packagemanager/oipkgconfigdlg.cpp 14 Jan 2006 12:10:24 -0000 -@@ -150,6 +150,10 @@ - options |= FORCE_REMOVE; - if ( m_optForceOverwrite->isChecked() ) - options |= FORCE_OVERWRITE; -+ if ( m_optForceRecursive->isChecked() ) -+ options |= FORCE_RECURSIVE; -+ if ( m_optVerboseWget->isChecked() ) -+ options |= FORCE_VERBOSE_WGET; - m_ipkg->setIpkgExecOptions( options ); - m_ipkg->setIpkgExecVerbosity( m_optVerboseIpkg->currentItem() ); - -@@ -336,9 +340,17 @@ - QWhatsThis::add( m_optForceOverwrite, tr( "Tap here to enable or disable the '-force-overwrite' option for Ipkg." ) ); - layout->addMultiCellWidget( m_optForceOverwrite, 3, 3, 0, 1 ); - -+ m_optForceRecursive = new QCheckBox( tr( "Force Recursive" ), container ); -+ QWhatsThis::add( m_optForceRecursive, tr( "Tap here to enable or disable the '-recursive' option for Ipkg." ) ); -+ layout->addMultiCellWidget( m_optForceRecursive, 4, 4, 0, 1 ); -+ -+ m_optVerboseWget = new QCheckBox( tr( "Verbose fetch" ), container ); -+ QWhatsThis::add( m_optVerboseWget, tr( "Tap here to enable or disable the '-verbose_wget' option for Ipkg." ) ); -+ layout->addMultiCellWidget( m_optVerboseWget, 5, 5, 0, 1 ); -+ - QLabel *l = new QLabel( tr( "Information level:" ), container ); - QWhatsThis::add( l, tr( "Select information level for Ipkg." ) ); -- layout->addMultiCellWidget( l, 4, 4, 0, 1 ); -+ layout->addMultiCellWidget( l, 6, 6, 0, 1 ); - - m_optVerboseIpkg = new QComboBox( container ); - QWhatsThis::add( m_optVerboseIpkg, tr( "Select information level for Ipkg." ) ); -@@ -346,15 +358,15 @@ - m_optVerboseIpkg->insertItem( tr( "Normal messages" ) ); - m_optVerboseIpkg->insertItem( tr( "Informative messages" ) ); - m_optVerboseIpkg->insertItem( tr( "Troubleshooting output" ) ); -- layout->addMultiCellWidget( m_optVerboseIpkg, 5, 5, 0, 1 ); -+ layout->addMultiCellWidget( m_optVerboseIpkg, 7, 7, 0, 1 ); - - l = new QLabel( tr( "Package source lists directory:" ), container ); - QWhatsThis::add( l, tr( "Enter the directory where package source feed information is stored." ) ); -- layout->addMultiCellWidget( l, 6, 6, 0, 1 ); -+ layout->addMultiCellWidget( l, 8, 8, 0, 1 ); - - m_optSourceLists = new QLineEdit( container ); - QWhatsThis::add( m_optSourceLists, tr( "Enter the directory where package source feed information is stored." ) ); -- layout->addWidget( m_optSourceLists, 7, 0 ); -+ layout->addWidget( m_optSourceLists, 9, 0 ); - - QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ), - QString::null, container ); -@@ -362,7 +374,7 @@ - btn->setMaximumWidth( btn->height() ); - QWhatsThis::add( btn, tr( "Tap here to select the directory where package source feed information is stored." ) ); - connect( btn, SIGNAL(clicked()), this, SLOT(slotOptSelectSourceListsPath()) ); -- layout->addWidget( btn, 7, 1 ); -+ layout->addWidget( btn, 9, 1 ); - - layout->addItem( new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) ); - } -@@ -433,6 +445,10 @@ - m_optForceRemove->setChecked( true ); - if ( options & FORCE_OVERWRITE ) - m_optForceOverwrite->setChecked( true ); -+ if ( options & FORCE_RECURSIVE ) -+ m_optForceRecursive->setChecked( true ); -+ if ( options & FORCE_VERBOSE_WGET ) -+ m_optVerboseWget->setChecked( true ); - - m_optVerboseIpkg->setCurrentItem( m_ipkg->ipkgExecVerbosity() ); - } -Index: oipkgconfigdlg.h -=================================================================== -RCS file: /cvs/opie/noncore/settings/packagemanager/oipkgconfigdlg.h,v -retrieving revision 1.10 -diff -u -u -r1.10 oipkgconfigdlg.h ---- packagemanager/oipkgconfigdlg.h 5 Jun 2005 22:18:10 -0000 1.10 -+++ packagemanager/oipkgconfigdlg.h 14 Jan 2006 12:10:24 -0000 -@@ -96,6 +96,8 @@ - QCheckBox *m_optForceReinstall; // Force reinstall ipkg option checkbox - QCheckBox *m_optForceRemove; // Force remove ipkg option checkbox - QCheckBox *m_optForceOverwrite; // Force overwrite ipkg option checkbox -+ QCheckBox *m_optForceRecursive; // Force recursive ipkg option checkbox -+ QCheckBox *m_optVerboseWget; // Force verbose_wget ipkg option checkbox - QComboBox *m_optVerboseIpkg; // Ipkg verbosity option selection - QLineEdit *m_optSourceLists; // Ipkg source lists destination directory - diff --git a/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb b/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb index 4e032baf63..385ca61fdb 100644 --- a/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb +++ b/packages/opie-packagemanager/opie-packagemanager_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/${APPNAME};cvsdate=${SRCDATE} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics;cvsdate=${SRCDATE} \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://0114_opie-pm-recursive-verbose_wget.diff;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From c51f011f9aeb125346e597c260fe7dfeb71da98e Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 20:36:04 +0000 Subject: opie-appearance 1.2.2 remove ui settings patch; patch applied upstream --- .../opie-appearance-1.2.1/.mtn2git_empty | 0 .../opie-appearance-1.2.1/add-ui-settings.patch | 86 ---------------------- packages/opie-appearance/opie-appearance_1.2.2.bb | 3 +- 3 files changed, 1 insertion(+), 88 deletions(-) delete mode 100644 packages/opie-appearance/opie-appearance-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch diff --git a/packages/opie-appearance/opie-appearance-1.2.1/.mtn2git_empty b/packages/opie-appearance/opie-appearance-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch b/packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch deleted file mode 100644 index 27fc32bac3..0000000000 --- a/packages/opie-appearance/opie-appearance-1.2.1/add-ui-settings.patch +++ /dev/null @@ -1,86 +0,0 @@ -Index: appearance.cpp -=================================================================== -RCS file: /cvs/opie/noncore/settings/appearance2/appearance.cpp,v -retrieving revision 1.35 -retrieving revision 1.37 -diff -u -r1.35 -r1.37 ---- appearance2/appearance.cpp 9 Jun 2005 20:47:58 -0000 1.35 -+++ appearance2/appearance.cpp 26 Oct 2005 15:36:04 -0000 1.37 -@@ -394,6 +394,39 @@ - m_rotdir_ccw-> setChecked ( rot == CCW ); - m_rotdir_flip-> setChecked ( rot == Flip ); - -+ QFrame *f2 = new QFrame ( tab ); -+ f2-> setFrameStyle ( QFrame::HLine | QFrame::Sunken ); -+ vertLayout-> addWidget ( f2 ); -+ vertLayout-> addSpacing ( 3 ); -+ -+ QHBoxLayout *bigIconlay = new QHBoxLayout ( vertLayout, 3 ); -+ -+ QLabel* label2 = new QLabel( tr( "Big Icon size:" ), tab ); -+ bigIconlay-> addWidget ( label2, 0, 0 ); -+ -+ m_bigIconSize = new QSpinBox(0, 128, 1, tab); -+ m_bigIconSize->setValue(cfg.readNumEntry( "BigIconSize", AppLnk::bigIconSize() )); -+ bigIconlay->addWidget( m_bigIconSize ); -+ label2->setBuddy( m_bigIconSize ); -+ QWhatsThis::add( label2, tr( "Big Icon Size determines the size of the application icons in Launcher" ) ); -+ QWhatsThis::add( m_bigIconSize, tr( "Big Icon Size determines the size of the application icons in Launcher" ) ); -+ -+ QHBoxLayout *smallIconlay = new QHBoxLayout ( vertLayout, 3 ); -+ -+ QLabel* label3 = new QLabel( tr( "Small Icon size:" ), tab ); -+ smallIconlay-> addWidget ( label3, 0, 0 ); -+ -+ m_smallIconSize = new QSpinBox(0, 128, 1, tab); -+ m_smallIconSize->setValue(cfg.readNumEntry( "SmallIconSize", AppLnk::smallIconSize() )); -+ smallIconlay->addWidget( m_smallIconSize ); -+ label3->setBuddy( m_smallIconSize ); -+ QWhatsThis::add( label3, tr( "Small Icon Size determines the size of many of the icons seen in applications (in menus, tab bars, tool bars, etc.), as well as the size of taskbar." ) ); -+ QWhatsThis::add( m_smallIconSize, tr( "Small Icon Size determines the size of many of the icons seen in applications (in menus, tab bars, tool bars, etc.), as well as the size of taskbar." ) ); -+ -+ m_useBigPixmaps = new QCheckBox( tr("use Big Pixmaps"), tab); -+ m_useBigPixmaps->setChecked(cfg.readBoolEntry( "useBigPixmaps", qApp->desktop()->width() > 320 )); -+ vertLayout->addWidget( m_useBigPixmaps ); -+ QWhatsThis::add( m_useBigPixmaps, tr( "Enlarge toolbar pixmaps, you probably want to enable this option for devices with screen resolution greater than 240x320" ) ); - - /* - * add a spacing -@@ -513,6 +546,10 @@ - - config. writeEntry( "LeftHand", m_leftHand->isChecked() ); - -+ config. writeEntry( "useBigPixmaps", m_useBigPixmaps->isChecked() ); -+ config. writeEntry( "BigIconSize", m_bigIconSize->value() ); -+ config. writeEntry( "SmallIconSize", m_smallIconSize->value() ); -+ - config. write ( ); // need to flush the config info first - Global::applyStyle ( ); - -Index: appearance.h -=================================================================== -RCS file: /cvs/opie/noncore/settings/appearance2/appearance.h,v -retrieving revision 1.13 -retrieving revision 1.14 -diff -u -r1.13 -r1.14 ---- appearance2/appearance.h 5 Jun 2005 22:47:00 -0000 1.13 -+++ appearance2/appearance.h 17 Oct 2005 13:28:10 -0000 1.14 -@@ -37,6 +37,7 @@ - #include - - #include -+#include - - using Opie::Ui::OFontSelector; - -@@ -123,6 +124,10 @@ - - QWidget * m_advtab; - QCheckBox *m_leftHand; -+ -+ QSpinBox *m_bigIconSize; -+ QSpinBox *m_smallIconSize; -+ QCheckBox *m_useBigPixmaps; - }; - - #endif diff --git a/packages/opie-appearance/opie-appearance_1.2.2.bb b/packages/opie-appearance/opie-appearance_1.2.2.bb index ee26b50ca6..7b154b7422 100644 --- a/packages/opie-appearance/opie-appearance_1.2.2.bb +++ b/packages/opie-appearance/opie-appearance_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/appearance2 \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://add-ui-settings.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From b464f87dffccc2a4b0d2fd501930dd1ba31ca98b Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Sun, 2 Jul 2006 22:06:07 +0000 Subject: linux-jlime-arm_2.6.16.bb: Addition of new jlime-7xx kernel * Addition of jlime 7xx arm kernel, need of changes linux-jlime-sh3_2.6.16.20: Patch & new defconfig * Add of patch line * Change in defconfig file unexpected-int-fx.patch: Addition of patch * Removes "unexpected ide interrupt" spam --- conf/distro/jlime-donkey.conf | 2 +- packages/linux/linux-jlime-arm_2.6.17.bb | 31 ++++++++++++++++ .../linux-jlime-sh3-2.6.16.20/defconfig_jlime | 41 ++++++++++++++-------- .../unexpected-int-fix.patch | 17 +++++++++ packages/linux/linux-jlime-sh3_2.6.16.20.bb | 3 +- 5 files changed, 78 insertions(+), 16 deletions(-) create mode 100644 packages/linux/linux-jlime-arm_2.6.17.bb create mode 100644 packages/linux/linux-jlime-sh3-2.6.16.20/unexpected-int-fix.patch diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index a103ddaf7c..89a10705ca 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -78,7 +78,7 @@ BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils ncurses nano wireless-tools console-too #<> #<>What Opie version should we use. #<> -OPIE_VERSION = "1.2.2" +OPIE_VERSION = "1.2.3" include conf/distro/preferred-opie-versions.inc #<> diff --git a/packages/linux/linux-jlime-arm_2.6.17.bb b/packages/linux/linux-jlime-arm_2.6.17.bb new file mode 100644 index 0000000000..c6d9ba8877 --- /dev/null +++ b/packages/linux/linux-jlime-arm_2.6.17.bb @@ -0,0 +1,31 @@ +SECTION = "kernel" +DESCRIPTION = "Linux kernel for Hitachi SH3 based Jornada 6xx" +LICENSE = "GPL" +PR = "r0" + +COMPATIBLE_HOST = "sh.*-linux" +COMPATIBLE_MACHINE = 'jornada6xx' + +SRC_URI = "http://www.jlime.com/downloads/Releases/donkey/kernels/6xx/sources/jlime-2.6.16.20-patched.tar.gz \ + file://defconfig_jlime \ + file://unexpected-int-fix.patch;patch=1" + +S = "${WORKDIR}/linux-${PV}" + +inherit kernel + +#Lets let 3.4.x handle the compilation of this one +KERNEL_CCSUFFIX = "-3.4.4" + +ARCH = "sh" +KERNEL_IMAGETYPE = "zImage" +FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/defconfig_jlime ${S}/.config +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE) +} diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime b/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime index 452b8d8210..8479d714c3 100644 --- a/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/defconfig_jlime @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-sh -# Thu Jun 8 03:45:30 2006 +# Sun Jul 2 00:14:05 2006 # CONFIG_SUPERH=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -432,7 +432,7 @@ CONFIG_IEEE80211_CRYPT_WEP=m # # Generic Driver Options # -# CONFIG_STANDALONE is not set +CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y @@ -614,12 +614,12 @@ CONFIG_ATMEL=m # CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_SPECTRUM=m -# CONFIG_AIRO_CS is not set +CONFIG_AIRO_CS=m CONFIG_PCMCIA_ATMEL=m CONFIG_PCMCIA_WL3501=m CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y +# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set CONFIG_HOSTAP_CS=m CONFIG_NET_WIRELESS=y @@ -858,7 +858,7 @@ CONFIG_FONT_PEARL_8x8=y # # Sound # -CONFIG_SOUND=y +CONFIG_SOUND=m # # Advanced Linux Sound Architecture @@ -868,11 +868,11 @@ CONFIG_SOUND=y # # Open Sound System # -CONFIG_SOUND_PRIME=y +CONFIG_SOUND_PRIME=m # CONFIG_OBSOLETE_OSS_DRIVER is not set # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set -CONFIG_SOUND_SH_DAC_AUDIO=y +CONFIG_SOUND_SH_DAC_AUDIO=m CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL=1 # @@ -913,10 +913,7 @@ CONFIG_EXT3_FS=m # CONFIG_EXT3_FS_XATTR is not set CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set @@ -979,9 +976,25 @@ CONFIG_RAMFS=y # # Network File Systems # -# CONFIG_NFS_FS is not set -# CONFIG_NFSD is not set -# CONFIG_SMB_FS is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +# CONFIG_NFSD_V4 is not set +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_RPCSEC_GSS_SPKM3 is not set +CONFIG_SMB_FS=m +# CONFIG_SMB_NLS_DEFAULT is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set diff --git a/packages/linux/linux-jlime-sh3-2.6.16.20/unexpected-int-fix.patch b/packages/linux/linux-jlime-sh3-2.6.16.20/unexpected-int-fix.patch new file mode 100644 index 0000000000..72801acf8e --- /dev/null +++ b/packages/linux/linux-jlime-sh3-2.6.16.20/unexpected-int-fix.patch @@ -0,0 +1,17 @@ +--- linux-2.6.16.20/drivers/ide/ide-io.c_orig 2006-07-01 23:54:34.000000000 +0000 ++++ linux-2.6.16.20/drivers/ide/ide-io.c 2006-07-01 23:55:50.000000000 +0000 +@@ -1442,10 +1442,10 @@ + ++count; + if (time_after(jiffies, last_msgtime + HZ)) { + last_msgtime = jiffies; +- printk(KERN_ERR "%s%s: unexpected interrupt, " +- "status=0x%02x, count=%ld\n", +- hwif->name, +- (hwif->next==hwgroup->hwif) ? "" : "(?)", stat, count); ++ //printk(KERN_ERR "%s%s: unexpected interrupt, " ++ // "status=0x%02x, count=%ld\n", ++ // hwif->name, ++ // (hwif->next==hwgroup->hwif) ? "" : "(?)", stat, count); + } + } + } diff --git a/packages/linux/linux-jlime-sh3_2.6.16.20.bb b/packages/linux/linux-jlime-sh3_2.6.16.20.bb index ef5db85812..c6d9ba8877 100644 --- a/packages/linux/linux-jlime-sh3_2.6.16.20.bb +++ b/packages/linux/linux-jlime-sh3_2.6.16.20.bb @@ -7,7 +7,8 @@ COMPATIBLE_HOST = "sh.*-linux" COMPATIBLE_MACHINE = 'jornada6xx' SRC_URI = "http://www.jlime.com/downloads/Releases/donkey/kernels/6xx/sources/jlime-2.6.16.20-patched.tar.gz \ - file://defconfig_jlime" + file://defconfig_jlime \ + file://unexpected-int-fix.patch;patch=1" S = "${WORKDIR}/linux-${PV}" -- cgit v1.2.3 From 4263f08d566c572c252e994f650bc2a554342127 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 20:39:32 +0000 Subject: opie-pcmciaapplet 1.2.2 remove activate-as-default; patch has been applied upstream --- .../opie-pcmciaapplet-1.2.1/.mtn2git_empty | 0 .../activate-as-default.patch | 42 ---------------------- .../opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb | 3 +- 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty b/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch b/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch deleted file mode 100644 index 4ec24ebaf8..0000000000 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet-1.2.1/activate-as-default.patch +++ /dev/null @@ -1,42 +0,0 @@ -Backported from CVS - -Index: noncore/applets/pcmcia/configdialogbase.ui -=================================================================== -RCS file: /cvs/opie/noncore/applets/pcmcia/configdialogbase.ui,v -retrieving revision 1.6 -diff -u -u -r1.6 configdialogbase.ui ---- pcmcia/configdialogbase.ui 20 Jun 2005 12:46:33 -0000 1.6 -+++ pcmcia/configdialogbase.ui 15 Nov 2005 21:37:22 -0000 -@@ -288,13 +288,13 @@ - - - text -- suspend -+ activate - - - - - text -- activate -+ suspend - - - -@@ -319,13 +319,13 @@ - - - text -- suspend -+ activate - - - - - text -- activate -+ suspend - - - - diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb index 565cec4272..ff6f2a337a 100644 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb +++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.2.bb @@ -2,5 +2,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/applets/pcmcia \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - file://activate-as-default.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics" -- cgit v1.2.3 From 7dfc337831690d310ebe78bf0b767ba8dd83d06d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 20:48:31 +0000 Subject: qte all-versions enable threads in mt-static variants --- packages/qte/qte-mt-static_2.3.10.bb | 4 ++-- packages/qte/qte-mt-static_2.3.12.bb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/qte/qte-mt-static_2.3.10.bb b/packages/qte/qte-mt-static_2.3.10.bb index a71b2af103..e7256f7b1d 100644 --- a/packages/qte/qte-mt-static_2.3.10.bb +++ b/packages/qte/qte-mt-static_2.3.10.bb @@ -1,7 +1,7 @@ require qte-common_${PV}.inc -PR = "r3" +PR = "r4" -EXTRA_OECONF += "-static" +EXTRA_OECONF += "-static -thread" do_stage() { rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 diff --git a/packages/qte/qte-mt-static_2.3.12.bb b/packages/qte/qte-mt-static_2.3.12.bb index 7cc0b3fdc0..4ed9458991 100644 --- a/packages/qte/qte-mt-static_2.3.12.bb +++ b/packages/qte/qte-mt-static_2.3.12.bb @@ -1,7 +1,7 @@ require qte-common_${PV}.inc -PR = "r2" +PR = "r3" -EXTRA_OECONF += "-static" +EXTRA_OECONF += "-static -thread" do_stage() { rm -rf ${STAGING_DIR}/${HOST_SYS}/qt2 -- cgit v1.2.3 From eaa94a9c8ad9a688958f8a5f050833226aa4d964 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 21:04:48 +0000 Subject: opie-backup 1.2.2 remove bugfix; patch has been applied upstream --- packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty | 0 packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch | 16 ---------------- packages/opie-backup/opie-backup_1.2.2.bb | 3 +-- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch diff --git a/packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty b/packages/opie-backup/opie-backup-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch b/packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch deleted file mode 100644 index 3a8bd7280d..0000000000 --- a/packages/opie-backup/opie-backup-1.2.1/1492-bugfix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: backup/backuprestore.cpp -=================================================================== -RCS file: /cvs/opie/noncore/settings/backup/backuprestore.cpp,v -retrieving revision 1.42 -retrieving revision 1.43 -diff -u -u -r1.42 -r1.43 ---- backup/backuprestore.cpp 9 Jun 2005 21:04:56 -0000 1.42 -+++ backup/backuprestore.cpp 16 Oct 2005 19:00:43 -0000 1.43 -@@ -102,6 +102,7 @@ - scanForApplicationSettings(); - refreshLocations(); - refreshBackupLocations(); -+ sourceDirChanged(restoreSource->currentItem()); - - // Read the list of items to ignore. - QList dontBackupList; diff --git a/packages/opie-backup/opie-backup_1.2.2.bb b/packages/opie-backup/opie-backup_1.2.2.bb index 3004eeae34..597fc577b8 100644 --- a/packages/opie-backup/opie-backup_1.2.2.bb +++ b/packages/opie-backup/opie-backup_1.2.2.bb @@ -3,5 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/backup \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://1492-bugfix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From c2fd5f3f9f19914fc7a1e41ffdc9935f54022b49 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 2 Jul 2006 21:11:53 +0000 Subject: opie-console 1.2.2 remove bug fixes that have been applied upstream --- .../opie-console/opie-console-1.2.1/.mtn2git_empty | 0 .../0117_opie-console-use-default-fixed.diff | 25 ---- .../opie-console-1.2.1/1647-bugfix.patch | 40 ------ .../opie-console-1.2.1/1686-bugfix.patch | 146 --------------------- packages/opie-console/opie-console_1.2.2.bb | 5 +- 5 files changed, 1 insertion(+), 215 deletions(-) delete mode 100644 packages/opie-console/opie-console-1.2.1/.mtn2git_empty delete mode 100644 packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff delete mode 100644 packages/opie-console/opie-console-1.2.1/1647-bugfix.patch delete mode 100644 packages/opie-console/opie-console-1.2.1/1686-bugfix.patch diff --git a/packages/opie-console/opie-console-1.2.1/.mtn2git_empty b/packages/opie-console/opie-console-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff deleted file mode 100644 index e871e8e1e4..0000000000 --- a/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff +++ /dev/null @@ -1,25 +0,0 @@ -Index: terminalwidget.cpp -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/terminalwidget.cpp,v -retrieving revision 1.12 -diff -u -u -r1.12 terminalwidget.cpp ---- opie-console/terminalwidget.cpp 16 Oct 2004 21:06:28 -0000 1.12 -+++ opie-console/terminalwidget.cpp 17 Jan 2006 10:00:13 -0000 -@@ -1,4 +1,5 @@ - #include "terminalwidget.h" -+#include - - /* QT */ - #include -@@ -151,8 +152,10 @@ - break; - }; - -+ Config qpecfg("qpe"); -+ qpecfg.setGroup("Appearance"); - -- m_fontSelector->setSelectedFont( prof.readEntry( "Font"), prof.readEntry( "FontStyle"), prof.readNumEntry( "FontSize" ), prof.readEntry( "FontCharset") ); -+ m_fontSelector->setSelectedFont( prof.readEntry( "Font", qpecfg.readEntry("FixedFontFamily")), prof.readEntry( "FontStyle", qpecfg.readEntry("FixedFontStyle")), prof.readNumEntry( "FontSize" , qpecfg.readNumEntry("FixedFontStyle")), prof.readEntry( "FontCharset") ); - - // switch( fontsize ) { - // case Profile::Micro: diff --git a/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch b/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch deleted file mode 100644 index c4603333cf..0000000000 --- a/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: opie-console/TEWidget.cpp -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/TEWidget.cpp,v -retrieving revision 1.13 -retrieving revision 1.14 -diff -u -u -r1.13 -r1.14 ---- opie-console/TEWidget.cpp 21 Jan 2005 19:56:17 -0000 1.13 -+++ opie-console/TEWidget.cpp 18 Oct 2005 13:56:12 -0000 1.14 -@@ -320,16 +320,21 @@ - - Config cfg("Konsole"); - cfg.setGroup("ScrollBar"); -- switch( cfg.readNumEntry("Position",2)){ -- case 0: -- scrollLoc = SCRNONE; -- break; -- case 1: -- scrollLoc = SCRLEFT; -- break; -- case 2: -- scrollLoc = SCRRIGHT; -- break; -+ -+ scrollLoc = cfg.readNumEntry("Position", -1); -+ -+ // bugfix for #1647 -+ // if user set 'show scrollbar on left' then let it be on left -+ // but only if it is not set in opie-console itself -+ if(scrollLoc == -1) -+ { -+ Config qpecfg ("qpe"); -+ qpecfg.setGroup("Appearance"); -+ scrollLoc = qpecfg.readNumEntry("LeftHand", SCRRIGHT); -+ if(scrollLoc == 0) // user set LeftHand in past and switched it off later -+ { -+ scrollLoc = SCRRIGHT; -+ } - }; - - blinkT = new QTimer(this); diff --git a/packages/opie-console/opie-console-1.2.1/1686-bugfix.patch b/packages/opie-console/opie-console-1.2.1/1686-bugfix.patch deleted file mode 100644 index f615581b32..0000000000 --- a/packages/opie-console/opie-console-1.2.1/1686-bugfix.patch +++ /dev/null @@ -1,146 +0,0 @@ -Index: emulation_handler.cpp -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/emulation_handler.cpp,v -retrieving revision 1.25 -retrieving revision 1.26 -diff -u -u -r1.25 -r1.26 ---- opie-console/emulation_handler.cpp 11 Jun 2005 12:22:32 -0000 1.25 -+++ opie-console/emulation_handler.cpp 12 Oct 2005 21:05:47 -0000 1.26 -@@ -250,3 +250,6 @@ - m_teWid->setWrapAt(columns); - } - -+void EmulationHandler::setScrollbarLocation(int index) { -+ m_teWid->setScrollbarLocation(index); -+} -Index: emulation_handler.h -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/emulation_handler.h,v -retrieving revision 1.8 -retrieving revision 1.9 -diff -u -u -r1.8 -r1.9 ---- opie-console/emulation_handler.h 8 Oct 2004 20:03:40 -0000 1.8 -+++ opie-console/emulation_handler.h 12 Oct 2005 21:05:47 -0000 1.9 -@@ -83,6 +83,7 @@ - - /* Propagate change to widget */ - void setWrap(int columns); -+ void setScrollbarLocation(int index); - signals: - void send( const QByteArray& ); - void changeSize(int rows, int cols ); -Index: mainwindow.cpp -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/mainwindow.cpp,v -retrieving revision 1.94 -retrieving revision 1.95 -diff -u -u -r1.94 -r1.95 ---- opie-console/mainwindow.cpp 16 May 2005 18:56:02 -0000 1.94 -+++ opie-console/mainwindow.cpp 12 Oct 2005 21:05:47 -0000 1.95 -@@ -69,6 +69,7 @@ - m_scripts = new QPopupMenu( this ); - m_sessionsPop= new QPopupMenu( this ); - m_scriptsPop = new QPopupMenu( this ); -+ m_scrollbar = new QPopupMenu( this ); - - /* add a toolbar for icons */ - m_icons = new QToolBar(this); -@@ -164,6 +165,17 @@ - connect( m_fullscreen, SIGNAL( activated() ), - this, SLOT( slotFullscreen() ) ); - -+ /* -+ * scrollbar -+ */ -+ sm_none = m_scrollbar->insertItem(tr( "None" )); -+ sm_left = m_scrollbar->insertItem(tr( "Left" )); -+ sm_right = m_scrollbar->insertItem(tr( "Right" )); -+ -+ m_console->insertItem(tr("Scrollbar"), m_scrollbar, -1, 0); -+ connect( m_scrollbar, SIGNAL(activated(int)), -+ this, SLOT(slotScrollbarSelected(int))); -+ - m_console->insertSeparator(); - - m_recordLog = new QAction(); -@@ -693,6 +705,35 @@ - m_isFullscreen = !m_isFullscreen; - } - -+void MainWindow::slotScrollbarSelected(int index) -+{ -+ int loc; -+ -+ Config cfg( "Konsole" ); -+ cfg.setGroup("ScrollBar"); -+ if(index == sm_none) -+ { -+ loc = 0; -+ } -+ else if(index == sm_left) -+ { -+ loc = 1; -+ } -+ else if(index == sm_right) -+ { -+ loc = 2; -+ } -+ -+ cfg.writeEntry("Position", loc); -+ -+ if (currentSession()) { -+ currentSession()->emulationHandler()->setScrollbarLocation(loc); -+ } -+ -+ m_scrollbar->setItemChecked(sm_none, index == sm_none); -+ m_scrollbar->setItemChecked(sm_left, index == sm_left); -+ m_scrollbar->setItemChecked(sm_right, index == sm_right); -+} - - void MainWindow::slotKeyReceived(FKey k, ushort, ushort, bool pressed) { - -Index: mainwindow.h -=================================================================== -RCS file: /cvs/opie/noncore/apps/opie-console/mainwindow.h,v -retrieving revision 1.29 -retrieving revision 1.30 -diff -u -u -r1.29 -r1.30 ---- opie-console/mainwindow.h 8 Oct 2004 20:03:40 -0000 1.29 -+++ opie-console/mainwindow.h 12 Oct 2005 21:05:47 -0000 1.30 -@@ -24,6 +24,7 @@ - class FKey; - class DocLnk; - -+ - class MainWindow : public QMainWindow { - Q_OBJECT - public: -@@ -75,6 +76,7 @@ - void slotKeyReceived(FKey, ushort, ushort, bool); - void slotSaveHistory(); - void slotSaveLog(); -+ void slotScrollbarSelected(int); - - /* what could these both slot do? */ - void slotCopy(); -@@ -105,6 +107,12 @@ - MetaFactory* m_factory; - ProfileManager* m_manager; - -+ /* -+ * scrollbar -+ */ -+ -+ int sm_none, sm_left, sm_right; -+ - TabWidget* m_consoleWindow; - QToolBar* m_tool; - QToolBar* m_icons; -@@ -115,6 +123,7 @@ - QPopupMenu* m_sessionsPop; - QPopupMenu* m_scriptsPop; - QPopupMenu* m_scripts; -+ QPopupMenu* m_scrollbar; - QAction* m_connect; - QAction* m_disconnect; - QAction* m_quickLaunch; diff --git a/packages/opie-console/opie-console_1.2.2.bb b/packages/opie-console/opie-console_1.2.2.bb index 5dbdba0790..795e3fcb11 100644 --- a/packages/opie-console/opie-console_1.2.2.bb +++ b/packages/opie-console/opie-console_1.2.2.bb @@ -3,7 +3,4 @@ include ${PN}.inc SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://1686-bugfix.patch;patch=1 \ - file://1647-bugfix.patch;patch=1 \ - file://0117_opie-console-use-default-fixed.diff;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" -- cgit v1.2.3 From 41877a64eb6d2e3ad8722ea89eb8eaa424a73516 Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Mon, 3 Jul 2006 00:45:47 +0000 Subject: packages/linux/linux-jlime-arm-2.6.17/* : Addition of patches for HP 7xx * Addition of patches to make the vanilla kernel know of the HP Jornada 7xx. Patches kept seperate because development is ongoing. Should work resonable though and should get incorperated into the mainline tree within 1-2 versions. packages/linux/linux-jlime-arm_2.6.17.bb: Changes to reflect updates * Addition of patches to file and also removal of all sh leftovers. --- .../linux/linux-jlime-arm-2.6.17/.mtn2git_empty | 0 .../AsmArm-ArchSa1100-Jornada720.patch | 40 +++ .../Cpu-Sa1110-Jornada720.patch | 32 ++ .../Kconfig-Arch-Jornada720.patch | 11 + .../Kconfig-Keyboard-Jornada720.patch | 13 + .../Kconfig-Touchscreen-Jornada720.patch | 14 + .../Kconfig-Video-Jornada720.patch | 20 ++ .../Mach-Sa1100-Jornada720.patch | 153 +++++++++ .../Makefile-Keyboard-Jornada720.patch | 8 + .../Makefile-Touchscreen-Jornada720.patch | 7 + .../Makefile-Video-Jornada720.patch | 10 + .../Newfile-Epson1356fb.patch | 344 +++++++++++++++++++++ .../Newfile-Jornada720_kbd.patch | 100 ++++++ .../Newfile-Jornada720_ts.patch | 106 +++++++ packages/linux/linux-jlime-arm_2.6.17.bb | 24 +- 15 files changed, 876 insertions(+), 6 deletions(-) create mode 100644 packages/linux/linux-jlime-arm-2.6.17/.mtn2git_empty create mode 100644 packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_kbd.patch create mode 100644 packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_ts.patch diff --git a/packages/linux/linux-jlime-arm-2.6.17/.mtn2git_empty b/packages/linux/linux-jlime-arm-2.6.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch new file mode 100644 index 0000000000..a1bc077242 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch @@ -0,0 +1,40 @@ +--- linux-2.6.17/include/asm-arm/arch-sa1100/jornada720.h_orig 2006-07-02 23:42:42.000000000 +0000 ++++ linux-2.6.17/include/asm-arm/arch-sa1100/jornada720.h 2006-07-02 23:50:32.000000000 +0000 +@@ -19,9 +19,37 @@ + #define GPIO_JORNADA720_KEYBOARD_IRQ IRQ_GPIO0 + #define GPIO_JORNADA720_MOUSE_IRQ IRQ_GPIO9 + ++/* Epson 1356 LCD controll parameters */ ++#define REGISTER_OFFSET ((unsigned char *) 0xf00000000) ++#define DISP_MEM_OFFSET ((unsigned char *) 0xf10000000) ++#define DISP_MEM_OFFSET_PHYS ((unsigned char *) 0x482000000) ++ ++#define MAX_BPP 16 ++#define MAX_XRES 640 ++#define MAX_YRES 240 ++#define MIN_XRES 64 ++#define MIN_YRES 64 ++ ++/* MCU COMMANDS */ ++#define MCU_GetBatteryData 0xc0 ++#define MCU_GetScanKeyCode 0x90 ++#define MCU_GetTouchSamples 0xa0 ++#define MCU_GetContrast 0xD0 ++#define MCU_SetContrast 0xD1 ++#define MCU_GetBrightness 0xD2 ++#define MCU_SetBrightness 0xD3 ++#define MCU_ContrastOff 0xD8 ++#define MCU_BrightnessOff 0xD9 ++#define MCU_PWMOFF 0xDF ++#define MCU_TxDummy 0x11 ++#define MCU_ErrorCode 0x00 ++ + #ifndef __ASSEMBLY__ + + void jornada720_mcu_init(void); ++int jornada720_mcu_byte(int arg_data); ++int jornada720_mcu_start(int arg_data); ++voide jornada720_mcu_end(void); + void jornada_contrast(int arg_contrast); + void jornada720_battery(void); + int jornada720_getkey(unsigned char *data, int size); diff --git a/packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch new file mode 100644 index 0000000000..c957971629 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch @@ -0,0 +1,32 @@ +--- linux-2.6.17/arch/arm/mach-sa1100/cpu-sa1110.c_orig 2006-07-02 20:44:56.000000000 +0000 ++++ linux-2.6.17/arch/arm/mach-sa1100/cpu-sa1110.c 2006-07-02 20:50:11.000000000 +0000 +@@ -70,6 +70,17 @@ + .cas_latency = 3, + }; + ++static struct sdram_params samsung_k4s281632b_1h __initdata = { ++ .rows = 12, ++ .tck = 10, ++ .trcd = 20, ++ .trp = 20, ++ .twr = 10, ++ .refresh = 64000, ++ .cas_latency = 3, ++ }; ++ ++ + static struct sdram_params samsung_k4s641632d_tc75 __initdata = { + .rows = 14, + .tck = 9, +@@ -349,6 +360,11 @@ + if (machine_is_h3100()) + sdram = &samsung_km416s4030ct; + ++ #if 0 ++ if (machine_is_jornada720()) ++ sdram = &samsung_k4s281632b_1h; ++ #endif ++ + if (sdram) { + printk(KERN_DEBUG "SDRAM: tck: %d trcd: %d trp: %d" + " twr: %d refresh: %d cas_latency: %d\n", diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch new file mode 100644 index 0000000000..61784c4040 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch @@ -0,0 +1,11 @@ +--- linux-2.6.17/arch/arm/Kconfig_orig 2006-07-02 20:41:49.000000000 +0000 ++++ linux-2.6.17/arch/arm/Kconfig 2006-07-02 20:42:57.000000000 +0000 +@@ -669,7 +669,7 @@ + + config CPU_FREQ_SA1110 + bool +- depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3) ++ depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3 || SA1100_JORNADA720) + default y + + config CPU_FREQ_INTEGRATOR diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch new file mode 100644 index 0000000000..a66aec2e98 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch @@ -0,0 +1,13 @@ +--- linux-2.6.17/drivers/input/keyboard/Kconfig_orig 2006-07-02 23:14:40.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/Kconfig 2006-07-02 23:16:12.000000000 +0000 +@@ -183,4 +183,10 @@ + This driver implements support for HIL-keyboards attached + to your machine, so normally you should say Y here. + ++config KEYBOARD_JORNADA720 ++ tristate "HP Jornada 720 Keyboard Support" ++ depends on SA110_JORNADA720 ++ default y ++ help ++ Say yes here if you want Jornada 720 keyboard support. + endif diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch new file mode 100644 index 0000000000..9b7fac44d5 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch @@ -0,0 +1,14 @@ +--- linux-2.6.17/drivers/input/touchscreen/Kconfig_orig 2006-07-02 23:31:00.000000000 +0000 ++++ linux-2.6.17/drivers/input/touchscreen/Kconfig 2006-07-02 23:32:53.000000000 +0000 +@@ -108,4 +108,11 @@ + To compile this driver as a module, choose M here: the + module will be called hp680_ts_input. + ++config TOUCHSCREEN_JORNADA720 ++ tristate "HP Jornada 720 touchscreen support" ++ depends on SA1100_JORNADA720 ++ help ++ Say Y here if you are using a HP Jornada 710/720/728 handheld ++ and want to user the touchscreen. ++ + endif diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch new file mode 100644 index 0000000000..aafcb90ecc --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch @@ -0,0 +1,20 @@ +--- linux-2.6.17/drivers/video/Kconfig_orig 2006-07-02 23:34:29.000000000 +0000 ++++ linux-2.6.17/drivers/video/Kconfig 2006-07-02 23:38:36.000000000 +0000 +@@ -613,6 +613,17 @@ + framebuffer. Product specs at + . + ++config FB_EPSON1356 ++ bool "Epson 1356 framebuffer support" ++ depends on FB && ARM && SA1100_JORNADA720 ++ select FB_CFB_FILLRECT ++ select FB_CFB_COPYAREA ++ select FB_CFB_IMAGEBLIT ++ select FB_SOFT_CURSOR ++ help ++ Support for the 1356 framebuffer device on the HP Jornada ++ 710/720/728 hanheld pc. ++ + config FB_S1D13XXX + tristate "Epson S1D13XXX framebuffer support" + depends on FB diff --git a/packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch new file mode 100644 index 0000000000..cbbb98f2bb --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch @@ -0,0 +1,153 @@ +--- linux-2.6.17/arch/arm/mach-sa1100/jornada720.c_orig 2006-07-02 20:54:55.000000000 +0000 ++++ linux-2.6.17/arch/arm/mach-sa1100/jornada720.c 2006-07-02 23:12:58.000000000 +0000 +@@ -22,11 +22,139 @@ + #include + #include + ++#include ++#include ++#include + #include "generic.h" + + + #define JORTUCR_VAL 0x20000400 + ++/* Jornada 720 MCU functions */ ++#define MCU_REVERSE(i) ((unsigned char)(((0x80 & i) >> 7) | ((0x40 & i) >> 5) \ ++ | ((0x20 & i) >> 3) | ((0x10 & i) >> 1) | ((0x08 & i) << 1) \ ++ | ((0x04 & i) << 3) | ((0x02 & i) << 5) | ((0x01 & i) << 7))) ++ ++void jornada720_init_ser(void) ++{ ++ int i; ++ ++ GPSR = GPIO_GPIO25; ++ Ser4SSCR0 = 0x0307; ++ Ser4MCCR0 = 0; ++ Ser4SSCR1 = 0x18; ++ Ser4SSCR0 = 0x0387; ++ while (Ser4SSSR & SSSR_RNE) ++ i = Ser4SSDR; ++} ++ ++int jornada720_mcu_byte(int arg_data) ++{ ++ int i; ++ ++ while ((Ser4SSSR & SSSR_TNF) == 0); ++ i = 0; ++ while ((GPLR & 0x400) && i++ < 400000); ++ /* wait for MCU */ ++ ++ if (i >= 400000) { ++ printk("jornada 720_mcu_byte: timed out\n"); ++ return -1; ++ } ++ Ser4SSDR = MCU_rEVERSE(arg_data) << 8; ++ udelay(100); ++ while ((Ser4SSSR & SSSR_RNE) == 0); ++ i = Ser4SSDR; ++ if (i > 0xff) ++ printk("jornada720 mcu_byte: read %x\n". i): ++ return MCU_REVERSE(i & 0xff) & 0xff; ++} ++ ++int jornada720_mcu_start(int arg_data) ++{ ++ int i; ++ ++ GPCR = GPIO_GPIO25; /* clear -> enable */ ++ udelay(100); ++ i = jornada720_mcu_byte(arg_data); ++ if (i != MCU_TxDummy) ++ { ++ printk("jornada720_mcu_start: sent %x got %x\n", arg_data, i); ++ for (i = 0; i < 256; i++) ++ if (jornada720_mcu_read() == -1) ++ break; ++ ++ jornada720_init_ser(); ++ return -1; ++ } ++ ++ return 0; ++} ++ ++ ++void jornada720_mcu_end(void) ++{ ++ udelay(100); ++ GPSR = GPIO_GPIO25; /* set */ ++} ++ ++void jornada720_mcu_init(void) ++{ ++ ++ int i; ++ ++ if (state) { ++ PPSR &= ~PPC_LDD1; ++ PPDR &= PPC_LDD1; ++ } ++ else { ++ PPSR |= PPC_LDD1; ++ } ++ return 0; ++} ++ ++static int jornada720_backlight_get_power(struct backlight_device *bd) ++{ ++ ++ return ~(PPSR&PPC_LDD1); ++} ++ ++static int jornada720_backlight_get_brightness(struct backlight_device *bd) ++{ ++ int brightness; ++ jornada720_mcu_start(MCU_GetBrightness); ++ brightness = jornada720_mcu_read(); ++ jornada720_mcu_end(); ++ return brightness; ++} ++ ++static int jornada720_backlight_set_brightness(struct backlight_device *bd) ++{ ++ int brightness = 255 - value; ++ jornada720_mcu_start(MCU_SetBrightness); ++ jornada720_mcu_byte(brightness); ++ jornada720_mcu_end(); ++ return 0; ++} ++ ++static struct backlight_properties jornada720_backlight_properties = { ++ .owner = THIS_MODULE, ++ .set_power = jornada720_backlight_set_power, ++ .get_power = jornada720_backlight_get_power, ++ .get_brightness = jornada720_backlight_get_brightness, ++ .set_brightness = jornada720_backlight_set_brightness, ++ .max_brightness = 255, ++} ++ ++static struct lcd_properties jornada 720_lcd_properties = { ++ .owner = THIS_MODULE, ++ .set_power = jornada720_lcd_set_power, ++ .get_power = jornada720_lcd_get_power, ++ .set_contrast = jornada720_lcd_set_contrast, ++ .get_contrast = jornada720_lcd_set_contrast, ++ .max_contrast = 255, ++} ++ + static struct resource sa1111_resources[] = { + [0] = { + .start = 0x40000000, +@@ -77,6 +205,10 @@ + PPDR |= PPC_LDD3 | PPC_LDD4; + + ret = platform_add_devices(devices, ARRAY_SIZE(devices)); ++ ++ jornada720_mcu_init(); ++ backlight_device_register("e1356fb", 0, &jornada720_backlight_properties); ++ ldc_device_register("e1356fb", 0, &jornada720_lcd_properties); + } + return ret; + } diff --git a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch new file mode 100644 index 0000000000..b1e2ab10e7 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch @@ -0,0 +1,8 @@ +--- linux-2.6.17/drivers/input/keyboard/Makefile_orig 2006-07-02 23:22:40.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/Makefile 2006-07-02 23:23:03.000000000 +0000 +@@ -15,4 +15,4 @@ + obj-$(CONFIG_KEYBOARD_SPITZ) += spitzkbd.o + obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o + obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o +- ++obj-$(CONFIG_KEYBOARD_JORNADA720) += jornada720_kbd.o diff --git a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch new file mode 100644 index 0000000000..deabd5cded --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch @@ -0,0 +1,7 @@ +--- linux-2.6.17/drivers/input/touchscreen/Makefile_orig 2006-07-02 23:28:02.000000000 +0000 ++++ linux-2.6.17/drivers/input/touchscreen/Makefile 2006-07-02 23:29:42.000000000 +0000 +@@ -12,3 +12,4 @@ + obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtouch.o + obj-$(CONFIG_TOUCHSCREEN_MK712) += mk712.o + obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680_ts_input.o ++obj-$(CONFIG_TOUCHSCREEN_JORNADA720) += jornada720_ts.o diff --git a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch new file mode 100644 index 0000000000..ae53cce9f3 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch @@ -0,0 +1,10 @@ +--- linux-2.6.17/drivers/video/Makefile_orig 2006-07-02 23:39:37.000000000 +0000 ++++ linux-2.6.17/drivers/video/Makefile 2006-07-02 23:40:15.000000000 +0000 +@@ -75,6 +75,7 @@ + obj-$(CONFIG_FB_SUN3) += sun3fb.o + obj-$(CONFIG_FB_HIT) += hitfb.o + obj-$(CONFIG_FB_EPSON1355) += epson1355fb.o ++obj-$(CONFIG_FB_EPSON1356) += epson1356fb.o + obj-$(CONFIG_FB_PVR2) += pvr2fb.o + obj-$(CONFIG_FB_VOODOO1) += sstfb.o + obj-$(CONFIG_FB_ARMCLCD) += amba-clcd.o diff --git a/packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch new file mode 100644 index 0000000000..7516f06dc9 --- /dev/null +++ b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch @@ -0,0 +1,344 @@ +--- linux-2.6.17/drivers/video/epson1356fb.c_orig 2006-07-03 00:20:43.000000000 +0000 ++++ linux-2.6.17/drivers/video/epson1356fb.c 2006-07-03 00:16:37.000000000 +0000 +@@ -0,0 +1,341 @@ ++/* ++ * linux/drivers/video/epson1356fb.c -- Epson 1356 LCD Controller Frame Buffer Device ++ * ++ * Copyright (C) 2001 MIT ++ * ++ * Edited from sa1100fb.c ++ * Copyright (C) 1999 Eric A. Thomas ++ * Based on acornfb.c Copyright (C) Russell King. ++ * ++ * This file is subject to the terms and conditions of the GNU General Public ++ * License. See the file COPYING in the main directory of this archive ++ * for more details. ++ * ++ * 20050203: Ported to kernel 2.6. Very basic interface for the Jornada 720 (C) Alex Lange (chicken@handhelds.org) ++ * ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++#include ++ ++u32 pseudo_pal[16]; ++ ++struct fb_info fb_info; ++ ++static int e1356fb_setcolreg(unsigned regno, unsigned red, unsigned green, ++ unsigned blue, unsigned transp, ++ struct fb_info *fb_info) ++{ ++ int bpp, m = 0; ++ ++ bpp = fb_info->var.bits_per_pixel; ++ m = (bpp <= 8) ? (1 << bpp) : 256; ++ if (regno >= m) { ++ printk("regno %d out of range (max %d)\n", regno, m); ++ return -EINVAL; ++ } ++ switch (bpp) { ++ case 8: ++ break; ++ case 16: ++ /* RGB 565 */ ++ pseudo_pal[regno] = ((red & 0xF800) | ++ ((green & 0xFC00) >> 5) | ++ ((blue & 0xF800) >> 11)); ++ break; ++ } ++ ++ return 0; ++} ++ ++static int e1356fb_blank(int blank, struct fb_info *info) ++{ ++ switch (blank) { ++ case FB_BLANK_POWERDOWN: ++ case FB_BLANK_VSYNC_SUSPEND: ++ case FB_BLANK_HSYNC_SUSPEND: ++ case FB_BLANK_NORMAL: ++ PPSR &= ~PPC_LDD1; ++ PPDR |= PPC_LDD1; ++ break; ++ ++ case FB_BLANK_UNBLANK: ++ PPSR |= PPC_LDD1; ++ mdelay(100); ++ } ++ return 0; ++} ++ ++static struct fb_var_screeninfo e1356fb_screeninfo = { ++ .xres = 640, ++ .yres = 240, ++ .xres_virtual = 640, ++ .yres_virtual = 240, ++ .bits_per_pixel = 16, ++ .red.length = 5, ++ .green.length = 6, ++ .blue.length = 5, ++ .transp.length = 0, ++ .red.offset = 11, ++ .green.offset = 5, ++ .blue.offset = 0, ++ .transp.offset = 0, ++ .activate = FB_ACTIVATE_NOW, ++ .height = -1, ++ .width = -1, ++ .vmode = FB_VMODE_NONINTERLACED, ++ .accel_flags = 0, ++ .nonstd = 0, ++}; ++ ++static struct fb_ops e1356fb_ops = { ++ .owner = THIS_MODULE, ++ .fb_setcolreg = e1356fb_setcolreg, ++ .fb_fillrect = cfb_fillrect, ++ .fb_copyarea = cfb_copyarea, ++ .fb_imageblit = cfb_imageblit, ++ .fb_cursor = soft_cursor, ++ .fb_blank = e1356fb_blank, ++}; ++ ++static struct fb_fix_screeninfo e1356fb_fix = { ++ .id = "e1356fb", ++ .smem_len = (MAX_XRES * MAX_YRES * MAX_BPP)/8, ++ .smem_start = (unsigned long)DISP_MEM_OFFSET_PHYS, ++ .type = FB_TYPE_PACKED_PIXELS, ++ .visual = FB_VISUAL_TRUECOLOR, ++ .line_length = (640 * 16) / 8, ++ .accel = FB_ACCEL_NONE, ++ .type_aux = 0, ++ .ypanstep = 0, ++ .ywrapstep = 0, ++}; ++ ++unsigned char LUT8[256*3] = { ++ /* Primary and secondary colors */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0x00, 0xA0, 0x00, 0x00, 0xA0, 0xA0, ++ 0xA0, 0x00, 0x00, 0xA0, 0x00, 0xA0, 0xA0, 0xA0, 0x00, 0xA0, 0xA0, 0xA0, ++ 0x50, 0x50, 0x50, 0x00, 0x00, 0xF0, 0x00, 0xF0, 0x00, 0x00, 0xF0, 0xF0, ++ 0xF0, 0x00, 0x00, 0xF0, 0x00, 0xF0, 0xF0, 0xF0, 0x00, 0xF0, 0xF0, 0xF0 ++}; ++ ++static char lut_base[] = { ++ /*red green blue rinc ginc binc */ ++ 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, /* Gray shades */ ++ 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, /* Black to red */ ++ 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, /* Black to green */ ++ 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* Black to blue */ ++ 0x00, 0x00, 0xF0, 0x00, 0x10, 0x00, /* Blue to cyan (blue and green) */ ++ 0x00, 0xf0, 0xf0, 0x00, 0x00, -0x10, /* Cyan (blue and green) to green */ ++ 0x00, 0xf0, 0x00, 0x10, 0x00, 0x00, /* Green to yellow (red and green)*/ ++ 0xf0, 0xf0, 0x00, 0x00, -0x10, 0x00, /* Yellow (red and green) to red */ ++ 0xf0, 0x00, 0x00, 0x00, 0x00, 0x10, /* Red to magenta (blue and red) */ ++ 0xf0, 0x00, 0xf0, -0x10, 0x00, 0x00, /* Magenta (blue and red) to blue */ ++ 0x00, 0x00, 0x00, 0x10, 0x00, 0x10, /* Black to magenta (blue and red)*/ ++ 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, /* Black to cyan (blue and green) */ ++ 0xf0, 0x00, 0x00, 0x00, 0x10, 0x10, /* Red to white */ ++ 0x00, 0xf0, 0x00, 0x10, 0x00, 0x10, /* Green to white */ ++ 0x00, 0x00, 0xf0, 0x10, 0x10, 0x00, /* Blue to white */ ++}; ++ ++void e1356fb_init_hardware(void) ++{ ++ unsigned char *pRegs = REGISTER_OFFSET; ++ unsigned char *pLUT = LUT8; ++ unsigned char *pseed = lut_base; ++ unsigned char plast[3]; ++ int i, j, rgb; ++ ++ /* Enable access to SED1356 by setting memory/register select bit to 0. */ ++ pRegs[0x001] = 0; ++ udelay(2); ++ /* Disable display outputs during initialization) */ ++ pRegs[0x1FC] = 0; ++ ++ /* Set the GPIOs to input. Should GPIO bits in register [004] get switched ++ then the GPIO outputs, according to register [008], are driven low. */ ++ pRegs[0x004] = 0; ++ pRegs[0x008] = 0; ++ ++ /* Program the LCD panel type and panel timing registers. ++ * The horizontal and vertical non-display times have been ++ * calculated for a 78 Hz frame rate. ++ * LCD PCLK ++ * FrameRate = ----------------------------- ++ * (HDP + HNDP) * (VDP/2 + VNDP) ++ * ++ * 20,000,000 ++ * = ---------------------------- = 78 Hz ++ * (640 + 256) * (480 / 2 + 45) ++ */ ++ ++ pRegs[0x10] = 0x1; /* Memory Clock Configuration Register */ ++ pRegs[0x14] = 0x11; /* LCD Pixel Clock Configuration Register */ ++ pRegs[0x18] = 0x1; /* CRT/TV Pixel Clock Configuration Register */ ++ pRegs[0x1c] = 0x1; /* MediaPlug Clock Configuration Register */ ++ pRegs[0x1e] = 0x1; /* CPU To Memory Wait State Select Register */ ++ pRegs[0x20] = 0; /* Memory Configuration Register */ ++ pRegs[0x21] = 0x45; /* DRAM Refresh Rate Register */ ++ pRegs[0x2a] = 0x1; /* DRAM Timings Control Register 0 */ ++ pRegs[0x2b] = 0x1; /* DRAM Timings Control Register 1 */ ++ pRegs[0x30] = 0x1c; /* Panel Type Register */ ++ pRegs[0x31] = 0; /* MOD Rate Register */ ++ pRegs[0x32] = 0x4f; /* LCD Horizontal Display Width Register */ ++ pRegs[0x34] = 0x7; /* LCD Horizontal Non-Display Period Register */ ++ pRegs[0x35] = 0x1; /* TFT FPLINE Start Position Register */ ++ pRegs[0x36] = 0xb; /* TFT FPLINE Pulse Width Register */ ++ pRegs[0x38] = 0xef; /* LCD Vertical Display Height Register 0 */ ++ pRegs[0x39] = 0; /* LCD Vertical Display Height Register 1 */ ++ pRegs[0x3a] = 0x13; /* LCD Vertical Non-Display Period Register */ ++ pRegs[0x3b] = 0xb; /* TFT FPFRAME Start Position Register */ ++ pRegs[0x3c] = 0x1; /* TFT FPFRAME Pulse Width Register */ ++ pRegs[0x40] = 0x5; /* LCD Display Mode Register */ ++ pRegs[0x41] = 0; /* LCD Miscellaneous Register */ ++ pRegs[0x42] = 0; /* LCD Display Start Address Register 0 */ ++ pRegs[0x43] = 0; /* LCD Display Start Address Register 1 */ ++ pRegs[0x44] = 0; /* LCD Display Start Address Register 2 */ ++ pRegs[0x46] = 0x80; /* LCD Memory Address Offset Register 0 */ ++ pRegs[0x47] = 0x2; /* LCD Memory Address Offset Register 1 */ ++ pRegs[0x48] = 0; /* LCD Pixel Panning Register */ ++ pRegs[0x4a] = 0; /* LCD Display FIFO High Threshold Control Register */ ++ pRegs[0x4b] = 0; /* LCD Display FIFO Low Threshold Control Register */ ++ pRegs[0x50] = 0x4f; /* CRT/TV Horizontal Display Width Register */ ++ pRegs[0x52] = 0x13; /* CRT/TV Horizontal Non-Display Period Register */ ++ pRegs[0x53] = 0x1; /* CRT/TV HRTC Start Position Register */ ++ pRegs[0x54] = 0xb; /* CRT/TV HRTC Pulse Width Register */ ++ pRegs[0x56] = 0xdf; /* CRT/TV Vertical Display Height Register 0 */ ++ pRegs[0x57] = 0x1; /* CRT/TV Vertical Display Height Register 1 */ ++ pRegs[0x58] = 0x2b; /* CRT/TV Vertical Non-Display Period Register */ ++ pRegs[0x59] = 0x9; /* CRT/TV VRTC Start Position Register */ ++ pRegs[0x5a] = 0x1; /* CRT/TV VRTC Pulse Width Register */ ++ pRegs[0x5b] = 0x10; /* TV Output Control Register */ ++ pRegs[0x60] = 0x3; /* CRT/TV Display Mode Register */ ++ pRegs[0x62] = 0; /* CRT/TV Display Start Address Register 0 */ ++ pRegs[0x63] = 0; /* CRT/TV Display Start Address Register 1 */ ++ pRegs[0x64] = 0; /* CRT/TV Display Start Address Register 2 */ ++ pRegs[0x66] = 0x40; /* CRT/TV Memory Address Offset Register 0 */ ++ pRegs[0x67] = 0x1; /* CRT/TV Memory Address Offset Register 1 */ ++ pRegs[0x68] = 0; /* CRT/TV Pixel Panning Register */ ++ pRegs[0x6a] = 0; /* CRT/TV Display FIFO High Threshold Control Register */ ++ pRegs[0x6b] = 0; /* CRT/TV Display FIFO Low Threshold Control Register */ ++ pRegs[0x70] = 0; /* LCD Ink/Cursor Control Register */ ++ pRegs[0x71] = 0x1; /* LCD Ink/Cursor Start Address Register */ ++ pRegs[0x72] = 0; /* LCD Cursor X Position Register 0 */ ++ pRegs[0x73] = 0; /* LCD Cursor X Position Register 1 */ ++ pRegs[0x74] = 0; /* LCD Cursor Y Position Register 0 */ ++ pRegs[0x75] = 0; /* LCD Cursor Y Position Register 1 */ ++ pRegs[0x76] = 0; /* LCD Ink/Cursor Blue Color 0 Register */ ++ pRegs[0x77] = 0; /* LCD Ink/Cursor Green Color 0 Register */ ++ pRegs[0x78] = 0; /* LCD Ink/Cursor Red Color 0 Register */ ++ pRegs[0x7a] = 0x1f; /* LCD Ink/Cursor Blue Color 1 Register */ ++ pRegs[0x7b] = 0x3f; /* LCD Ink/Cursor Green Color 1 Register */ ++ pRegs[0x7c] = 0x1f; /* LCD Ink/Cursor Red Color 1 Register */ ++ pRegs[0x7e] = 0; /* LCD Ink/Cursor FIFO Threshold Register */ ++ pRegs[0x80] = 0; /* CRT/TV Ink/Cursor Control Register */ ++ pRegs[0x81] = 0x1; /* CRT/TV Ink/Cursor Start Address Register */ ++ pRegs[0x82] = 0; /* CRT/TV Cursor X Position Register 0 */ ++ pRegs[0x83] = 0; /* CRT/TV Cursor X Position Register 1 */ ++ pRegs[0x84] = 0; /* CRT/TV Cursor Y Position Register 0 */ ++ pRegs[0x85] = 0; /* CRT/TV Cursor Y Position Register 1 */ ++ pRegs[0x86] = 0; /* CRT/TV Ink/Cursor Blue Color 0 Register */ ++ pRegs[0x87] = 0; /* CRT/TV Ink/Cursor Green Color 0 Register */ ++ pRegs[0x88] = 0; /* CRT/TV Ink/Cursor Red Color 0 Register */ ++ pRegs[0x8a] = 0x1f; /* CRT/TV Ink/Cursor Blue Color 1 Register */ ++ pRegs[0x8b] = 0x3f; /* CRT/TV Ink/Cursor Green Color 1 Register */ ++ pRegs[0x8c] = 0x1f; /* CRT/TV Ink/Cursor Red Color 1 Register */ ++ pRegs[0x8e] = 0; /* CRT/TV Ink/Cursor FIFO Threshold Register */ ++ ++ /* Set the 2D acceleration (BitBLT) registers to a known state */ ++ for (i = 0x100; i <= 0x119; i++) ++ if (i != 0x107 && i != 0x10b && i != 0x10e && i != 0x10f && i != 0x117) ++ pRegs[i] = 0x00; ++ ++ /* Program the look-up table to a known state. */ ++ pRegs[0x1E0] = 0x01; /* Enable the LCD LUT for read/write. */ ++ pRegs[0x1E2] = 0; /* Reset the LUT address. */ ++ for (i = 0; i < 16 * 3; i++) ++ pRegs[0x1E4] = *pLUT++; /* non-regular color template */ ++ ++ for (i = 0; i < 15; i++) { ++ for (rgb = 0; rgb < 3; rgb++) { ++ plast[rgb] = *pseed++; /* base color value */ ++ pRegs[0x1E4] = plast[rgb]; ++ } ++ for (j = 0; j < 15; j++) ++ for (rgb = 0; rgb < 3; rgb++) { ++ plast[rgb] += pseed[rgb]; /* increment through color values*/ ++ pRegs[0x1E4] = plast[rgb]; ++ } ++ pseed += 3; ++ } ++ ++ pRegs[0x1e4] = 0; /* Look-Up Table Data Register */ ++ pRegs[0x1f0] = 0; /* Power Save Configuration Register */ ++ pRegs[0x1f1] = 0; /* Power