summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/checksums.ini4
-rw-r--r--conf/distro/angstrom-2007.1.conf14
-rw-r--r--conf/distro/include/angstromoabi.inc4
-rw-r--r--conf/distro/include/sane-srcdates.inc20
-rw-r--r--conf/machine/fic-gta01.conf4
-rw-r--r--conf/machine/fic-gta02.conf38
-rw-r--r--conf/machine/htcuniversal.conf3
7 files changed, 76 insertions, 11 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 749a719a23..219fb74b0c 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11909,3 +11909,7 @@ sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c
[http://simh.trailing-edge.com/sources/simhv37-1.zip]
md5=c8c57379e2e9afbf9817fbbe99ee1106
sha256=4c3f7374e1faa54c705f7c139e992bb7d3492e9dc62aca5b1e24e5a43bb0f132
+
+[http://www.pengutronix.de/software/memedit/downloads/memedit-0.7.tar.gz]
+md5=3d0f372fb213e09b8d04826f3a0bc2eb
+sha256=9bb7412a03a76da4219215d2f92addf71305ab3fcc7d9315bb6f9c41fbe851fd
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 6ef9646814..ca938adc43 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -10,9 +10,12 @@
DISTRO_VERSION = "test-${DATE}"
DISTRO_REVISION = "46"
-require conf/distro/include/angstrom.inc
require conf/distro/include/sane-srcdates.inc
+#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
+ARM_ABI = "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad']]}"
+require conf/distro/include/angstrom${ARM_ABI}.inc
+
#Images built can have to modes:
# 'debug': empty rootpassword, strace and gdb included
# 'release' no root password, no strace and gdb by default
@@ -88,11 +91,6 @@ FEED_ARCH_simpad = "arm-oabi"
#Tweak packaging for strongarm machines since they can't use EABI
-PACKAGE_ARCH_collie = "arm-oabi"
-PACKAGE_ARCH_h3600 = "arm-oabi"
-PACKAGE_ARCH_h3800 = "arm-oabi"
-PACKAGE_ARCH_simpad = "arm-oabi"
-
PACKAGE_EXTRA_ARCHS_collie = "arm-oabi"
PACKAGE_EXTRA_ARCHS_h3600 = "arm-oabi"
PACKAGE_EXTRA_ARCHS_h3800 = "arm-oabi"
@@ -126,7 +124,7 @@ MACHINE_KERNEL_VERSION = "2.6"
PCMCIA_MANAGER = "pcmciautils"
#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh8"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh9"
PREFERRED_VERSION_linux_at91sam9263ek ?= "2.6.20"
@@ -138,7 +136,7 @@ PREFERRED_VERSION_file = "4.18"
PREFERRED_VERSION_file_native = "4.18"
PREFERRED_VERSION_fontconfig = "2.4.1"
-PREFERRED_VERSION_freetype = "2.3.3"
+PREFERRED_VERSION_freetype = "2.3.4"
PREFERRED_VERSION_freetype-native = "2.2.1"
PREFERRED_VERSION_cairo = "1.4.8"
PREFERRED_VERSION_glib-2.0 = "2.12.12"
diff --git a/conf/distro/include/angstromoabi.inc b/conf/distro/include/angstromoabi.inc
new file mode 100644
index 0000000000..bb7bc45fbd
--- /dev/null
+++ b/conf/distro/include/angstromoabi.inc
@@ -0,0 +1,4 @@
+require conf/distro/include/angstrom.inc
+
+PACKAGE_ARCH = "arm-oabi"
+
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index bd5703c909..75e8b86e4d 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -50,7 +50,24 @@ SRCDATE_gconf-dbus ?= "20070512"
SRCDATE_gnome-vfs ?= "20060119"
SRCDATE_gtkhtml2 ?= "20060323"
-#Misc apps, sorted by alphabet
+# Enlightenment (libs)
+SRCDATE_edb ?= "20070601"
+SRCDATE_enhanve ?= "20070601"
+SRCDATE_engrave ?= "20070601"
+SRCDATE_exml ?= "20070601"
+
+# Enlightenment (apps)
+SRCDATE_edje-viewer = "20070601"
+SRCDATE_emphasis = "20070601"
+SRCDATE_ephoto = "20070601"
+SRCDATE_examine = "20070601"
+SRCDATE_expedite = "20070601"
+SRCDATE_elitaire = "20070504"
+SRCDATE_entice = "20070601"
+SRCDATE_e-utils = "20070601"
+SRCDTE_exhibit = "20070601"
+
+# Misc apps, sorted by alphabet
SRCDATE_avetanabt ?= "20060814"
SRCDATE_bl ?= "20060814"
SRCDATE_dvbstream ?= "20060814"
@@ -71,6 +88,7 @@ SRCDATE_madwifi-modules ?= "20060814"
SRCDATE_maemo-mapper-nohildon ?= "20061114"
SRCDATE_mileage ?= "20060814"
SRCDATE_minimo ?= "20050401"
+SRCDATE_mpd ?= "20070210"
SRCDATE_mystun-server ?= "20060814"
SRCDATE_olsrd ?= "20060814"
SRCDATE_opencvs ?= "20060814"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index c479075285..a797d5ec04 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Machine
#@NAME: FIC GTA01 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973 GSM phone
+#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone
#-----------------------------------------------------------------------------
TARGET_ARCH = "arm"
@@ -23,7 +23,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
kernel-module-ext2 \
alsa-state"
-# used by sysvinit_2
+# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab
#SERIAL_CONSOLE = "115200 ttySAC0"
# used by some images
diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf
new file mode 100644
index 0000000000..a946f49c4f
--- /dev/null
+++ b/conf/machine/fic-gta02.conf
@@ -0,0 +1,38 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Machine
+#@NAME: FIC GTA02 (Neo1973)
+#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#-----------------------------------------------------------------------------
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-gta02"
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi"
+
+MACHINE_EXTRA_RDEPENDS = "alsa-state"
+
+# package gta01 specific modules
+MACHINE_EXTRA_RRECOMMENDS = "\
+ kernel-module-gta01-pm-bt \
+ kernel-module-gta01-pm-gps \
+ kernel-module-gta01-pm-gsm \
+ kernel-module-gta01kbd \
+ kernel-module-s3cmci \
+ kernel-module-ext2 \
+ alsa-state"
+
+SERIAL_CONSOLE = "115200 ttySAC2"
+
+# used by some images
+ROOT_FLASH_SIZE = "256"
+
+# extra jffs2 tweaks
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
+
+# build tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+
+# tune for S3C24x0
+include conf/machine/include/tune-arm920t.conf
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
index 95eb7354fe..e2e7f2f2d1 100644
--- a/conf/machine/htcuniversal.conf
+++ b/conf/machine/htcuniversal.conf
@@ -35,6 +35,8 @@ MACHINE_EXTRA_RRECOMMENDS = " kernel-module-nls-cp437 \
kernel-module-htcuniversal-acx \
kernel-module-acx \
kernel-module-i2c-algo-bit \
+ kernel-module-htcuniversal-ts2 \
+ kernel-module-ts-adc-debounce \
"
#
@@ -45,6 +47,7 @@ module_autoload_htcuniversal_acx = "htcuniversal_acx"
module_autoload_snd-pcm-oss = "snd-pcm-oss"
module_autoload_snd-mixer-oss = "snd-mixer-oss"
module_autoload_snd-htcuniversal_audio = "snd-htcuniversal_audio"
+module_autoload_htcuniversal-ts2 = "htcuniversal-ts2"
#FIXME: this should be controlled by a userspace utility later.
module_autoload_g_ether = "g_ether"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 07:14:29 +0000