diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2008-10-24 08:34:22 -0400 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2008-10-24 08:34:22 -0400 |
| commit | 703cea83a1859db8c18b75a7911dc99f1dc2095a (patch) | |
| tree | aa373fca39923837156a6468c13d87a5323b1631 /conf | |
| parent | 97f239bff818c4836572495c05f983a9fab09202 (diff) | |
| parent | 8655c6c036a930bd0767efcf512ddb8dd654c6b9 (diff) | |
Merge commit 'openembedded.org/org.openembedded.dev' into org.openembedded.dev
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/davinci-dvevm.conf | 3 | ||||
| -rw-r--r-- | conf/machine/i586-generic.conf | 2 | ||||
| -rw-r--r-- | conf/machine/i686-generic.conf | 2 | ||||
| -rw-r--r-- | conf/machine/neuros-osd2.conf | 5 | ||||
| -rw-r--r-- | conf/machine/om-gta01.conf | 2 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 2 |
6 files changed, 4 insertions, 12 deletions
diff --git a/conf/machine/davinci-dvevm.conf b/conf/machine/davinci-dvevm.conf index c926c6ff8a..50c6561a95 100644 --- a/conf/machine/davinci-dvevm.conf +++ b/conf/machine/davinci-dvevm.conf @@ -21,8 +21,5 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" MACHINE_FEATURES = "kernel26 pcmcia usbhost alsa" -MACHINE_EXTRA_RDEPENDS = "dsplink" -MACHINE_EXTRA_RRECOMMENDS = "dsplink-module" - require conf/machine/include/tune-arm926ejs.inc diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index e715eeb83b..7918131cd3 100644 --- a/conf/machine/i586-generic.conf +++ b/conf/machine/i586-generic.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "i586" -PACKAGE_EXTRA_ARCHS = "x86 i386 i486" +PACKAGE_EXTRA_ARCHS = "x86" PREFERRED_PROVIDER_virtual/kernel = "linux" diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index 685d763e6d..b4d254ca50 100644 --- a/conf/machine/i686-generic.conf +++ b/conf/machine/i686-generic.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "i686" -PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586" +PACKAGE_EXTRA_ARCHS = "x86" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf index f852a9e82b..b751cbcac2 100644 --- a/conf/machine/neuros-osd2.conf +++ b/conf/machine/neuros-osd2.conf @@ -7,10 +7,6 @@ TARGET_ARCH = "arm" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-neuros" - -module_autoload_cmem = "cmemk phys_start=0x8EA00000 phys_end=0x8F200000 pools=1x3145728,5x829440,1x61440,1x10240" -module_autoload_dsplink = "dsplinkk" - KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "0x80008000" @@ -31,4 +27,3 @@ MACHINE_FEATURES = "kernel26 pcmcia usbhost screen" require conf/machine/include/tune-arm926ejs.inc require conf/machine/include/neuros.inc -MACHINE_EXTRA_RRECOMMENDS = " dsplink-cmemk-module dsplink-module" diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index 57d81c2ade..a45380f606 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" MACHINE_CLASS = "neo1973" -PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 ${MACHINE_CLASS}" +PACKAGE_EXTRA_ARCHS = "fic-gta01 ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 88aa3881c7..9876ebecbd 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" MACHINE_CLASS = "neo1973" -PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}" +PACKAGE_EXTRA_ARCHS = "fic-gta02 ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo" |