diff options
| author | Leon Woestenberg <leon@sidebranch.com> | 2009-06-09 13:13:50 +0200 |
|---|---|---|
| committer | Leon Woestenberg <leon@sidebranch.com> | 2009-06-09 13:13:50 +0200 |
| commit | bd1a2c60e37b7291d08ecb318cf3efd55e75b83c (patch) | |
| tree | c1080374f843de5d81733c214e6bb6fb8cca46a7 /conf/machine | |
| parent | f342e6cd9fd63dc8ab03e2e51559c3dfa97bf73f (diff) | |
| parent | d9bcd179a5a1e02de4cd2490bfb821e1a7270188 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/dm355-evm.conf | 2 | ||||
| -rw-r--r-- | conf/machine/dm365-evm.conf | 2 | ||||
| -rw-r--r-- | conf/machine/dm6467-evm.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/davinci.inc | 2 | ||||
| -rw-r--r-- | conf/machine/tx27.conf | 6 |
5 files changed, 8 insertions, 6 deletions
diff --git a/conf/machine/dm355-evm.conf b/conf/machine/dm355-evm.conf index d509152b22..9ef4ff7c7d 100644 --- a/conf/machine/dm355-evm.conf +++ b/conf/machine/dm355-evm.conf @@ -4,4 +4,4 @@ require conf/machine/include/davinci.inc -UBOOT_MACHINE = "davinci_dvevm_config" +UBOOT_MACHINE = "davinci_dm355_evm_config" diff --git a/conf/machine/dm365-evm.conf b/conf/machine/dm365-evm.conf index 09f4a353ca..de2cc4a759 100644 --- a/conf/machine/dm365-evm.conf +++ b/conf/machine/dm365-evm.conf @@ -4,4 +4,4 @@ require conf/machine/include/davinci.inc -UBOOT_MACHINE = "davinci_dvevm_config" +UBOOT_MACHINE = "davinci_dm365_evm_config" diff --git a/conf/machine/dm6467-evm.conf b/conf/machine/dm6467-evm.conf index 66ed1fe1f2..a7596f17f8 100644 --- a/conf/machine/dm6467-evm.conf +++ b/conf/machine/dm6467-evm.conf @@ -4,4 +4,4 @@ require conf/machine/include/davinci.inc -UBOOT_MACHINE = "davinci_dvevm_config" +UBOOT_MACHINE = "davinci_dm6467_evm_config" diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc index 3134c28d18..af9dc0ff9c 100644 --- a/conf/machine/include/davinci.inc +++ b/conf/machine/include/davinci.inc @@ -9,7 +9,7 @@ KERNEL_IMAGETYPE = "uImage" PREFERRED_PROVIDER_virtual/kernel = "linux-davinci" -PREFERRED_VERSION_u-boot = "git" +PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "davinci_dvevm_config" UBOOT_ENTRYPOINT = "0x80008000" diff --git a/conf/machine/tx27.conf b/conf/machine/tx27.conf index ef7742ef01..a3e784c110 100644 --- a/conf/machine/tx27.conf +++ b/conf/machine/tx27.conf @@ -10,6 +10,8 @@ GUI_MACHINE_CLASS = "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "linux" PREFERRED_VERSION_linux = "2.6.28" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" require conf/machine/include/tune-arm926ejs.inc @@ -20,8 +22,8 @@ ROOT_FLASH_SIZE = "128" IMAGE_FSTYPES ?= "jffs2" -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 \ - --pad ; sumtool --eraseblock=0x20000 \ +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n \ + --pad ; sumtool --eraseblock=0x20000 -n \ --littleendian --pad \ -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary" |