diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-07-30 11:31:03 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-07-30 11:31:03 +0000 |
| commit | cca7de1567a0a1e6cedd31607ebd8700d0ef6ecd (patch) | |
| tree | 6638b6d81435f5910ad17c81042eb2dd3963eb30 | |
| parent | 3c6bdd293e75211bb070789bbeadbe5ebf5e4a32 (diff) | |
| parent | 929f61d2aef5cf85e6d88cdbcf542c838a03bf34 (diff) | |
merge of '21cc63203b5df2e8d90f0a909db0ffa185502b72'
and 'f87475ccf1fd18294a9edb79090422cc8f201753'
| -rw-r--r-- | classes/openmoko-panel-plugin.bbclass | 2 | ||||
| -rw-r--r-- | conf/machine/fic-gta01.conf | 4 | ||||
| -rw-r--r-- | conf/machine/fic-gta02.conf | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/classes/openmoko-panel-plugin.bbclass b/classes/openmoko-panel-plugin.bbclass index 0494b412c6..4ef42b5015 100644 --- a/classes/openmoko-panel-plugin.bbclass +++ b/classes/openmoko-panel-plugin.bbclass @@ -1,6 +1,6 @@ SECTION = "openmoko/panel-plugin" DEPENDS += "matchbox-panel-2" -inherit openmoko +inherit openmoko2 FILES_${PN} = "${libdir}/matchbox-panel/lib*.so* ${datadir}" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index 4e07379582..19bcb7607c 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -35,8 +35,8 @@ ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n" -# build tools -EXTRA_IMAGEDEPENDS += "sjf2410-linux-native" +# build / upload tools +EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" # tune for S3C24x0 include conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index 45483fd21e..a87222cc3e 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -1,7 +1,7 @@ #----------------------------------------------------------------------------- #@TYPE: Machine #@NAME: FIC GTA02 (Neo1973) -#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone +#@DESCRIPTION: Machine configuration for the FIC Neo1973.2 GSM phone #----------------------------------------------------------------------------- TARGET_ARCH = "arm" @@ -32,10 +32,10 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks -EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n" +EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n" -# build tools -EXTRA_IMAGEDEPENDS += "sjf2410-linux-native" +# build / upload tools +EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" # tune for S3C24x0 include conf/machine/include/tune-arm920t.conf |