diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-27 16:39:20 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-10-27 16:39:20 +0100 |
| commit | c9621cc1a42a7cd06529791922dd68d07d46b9de (patch) | |
| tree | f53a4344f94c0554a327481870e7e4432280f49a /conf/machine | |
| parent | 247688aaac7b4f57740a327ebd6c33660642fa98 (diff) | |
| parent | 5642836ea59a6bff972b1c921d4df89e63eb5db3 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/igep0020.conf | 2 | ||||
| -rw-r--r-- | conf/machine/include/omap3.inc | 2 | ||||
| -rw-r--r-- | conf/machine/nhk15.conf | 24 |
3 files changed, 27 insertions, 1 deletions
diff --git a/conf/machine/igep0020.conf b/conf/machine/igep0020.conf index 512a977748..deb17233cc 100644 --- a/conf/machine/igep0020.conf +++ b/conf/machine/igep0020.conf @@ -19,6 +19,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-igep2" KERNEL_IMAGETYPE = "uImage" +UBOOT_MACHINE = "omap3_igep0020b_config" + IMAGE_FSTYPES += "tar.bz2 ubi" # Guesswork diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 675249a064..bb750aad98 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r47" +MACHINE_KERNEL_PR = "r48" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/nhk15.conf b/conf/machine/nhk15.conf new file mode 100644 index 0000000000..ad6227848b --- /dev/null +++ b/conf/machine/nhk15.conf @@ -0,0 +1,24 @@ +#@TYPE: Machine +#@NAME: ST Nomadik + +#@DESCRIPTION: Machine configuration for the ST Nomadik developmnt board +TARGET_ARCH = "arm" + +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n -x lzo" + +IMAGE_FSTYPES ?= "tar.bz2 ext2.gz jffs2" + +SERIAL_CONSOLE = "115200 ttyAMA1" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "00008000" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-nomadik" +XSERVER = "xserver-kdrive-nomadikfb" + +MACHINE_FEATURES = "kernel26 apm usbgadget" +#MACHINE_EXTRA_RRECOMMENDS="kernel-module-nomadik-saa kernel-module-nomadik-sva" +#MACHINE_EXTRA_RRECOMMENDS="kernel-module-nmdkmod-saa kernel-module-nmdkmod-sva kernel-module-nmdkmod-alsa kernel-module-nmdkmod-v4l2" + +require conf/machine/include/tune-arm926ejs.inc |