diff options
| author |   Holger Freyther <zecke@selfish.org> | 2008-04-28 14:29:01 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2008-04-28 14:29:01 +0000 |
| commit | ac03da524e5e040ca320c59b2b03c75685d925e0 (patch) | |
| tree | f5853262cfd0bc85049eebb3842224cce9c1f1cd /conf | |
| parent | 24dc77b97b4c9a2a3d05078e81d9cab8d64a1809 (diff) | |
| parent | f548461fca3bba7329777be4f89870c6f1cdccc1 (diff) | |
| download | openembedded-ac03da524e5e040ca320c59b2b03c75685d925e0.tar.gz | |
merge of '54b3dda1df013d6327e2ce8df95d7cfeeac2fbae'
and 'b5af291fa9dc074af84727684ddae1efa9c1be0d'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | conf/machine/at32stk1000.conf | 3 | ||||
| -rw-r--r-- | conf/machine/htckaiser.conf | 25 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 5 |
4 files changed, 29 insertions, 6 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index b42f915bbb..381a6127aa 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -37,7 +37,7 @@ SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "193" +SRCREV_pn-gsm0710muxd ?= "263" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 15e3c85ec5..13523ee1e5 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -22,8 +22,9 @@ ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "1.1.4" +PREFERRED_VERSION_u-boot = "1.3.2" +UBOOT_MACHINE = "atstk1002_config" UBOOT_ENTRYPOINT = "0x90000000" UBOOT_LOADADDRESS = "0x10000000" diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf new file mode 100644 index 0000000000..ad17bb82bf --- /dev/null +++ b/conf/machine/htckaiser.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@NAME: HTC Kaiser phone +#@DESCRIPTION: Machine configuration for HTC Kaiser phone +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" + +TARGET_FPU = "soft" +TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" +FEED_ARCH = "armv6" +PACKAGE_ARCH = "armv6" + + +IMAGE_FSTYPES ?= "tar.gz cpio.gz" + +PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser" + +MACHINE_FEATURES = "kernel26 touchscreen screen keyboard" + diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 18678cc336..e041b34c6f 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -34,6 +34,7 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ --littleendian --pad \ @@ -45,7 +46,3 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc - -# build YAFFS2 -IMAGE_FSTYPES ?= "jffs2 yaffs2" - |