diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-04-30 09:22:52 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-04-30 09:22:52 +0200 |
| commit | 8ef37e61f2e2db01d32dd6ec9a89202e973dddc8 (patch) | |
| tree | d6a0a7cbb1c072c042904ccbb2413b672a3d7b96 /conf/machine/include | |
| parent | 7efc24bf60fcb40244c69853f21e11cdb23e57e9 (diff) | |
| parent | 0263ec2aaffbe8e14a6e6ee71c0e7dd17d1a3d2c (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 15 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell.inc | 6 |
2 files changed, 8 insertions, 13 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 71fea7a508..d3345b469b 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -22,20 +22,21 @@ PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon" PCMCIA_MANAGER ?= "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat ext2" MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " -MACHINE_FEATURES_append_spitz = " usbhost ext2 " +MACHINE_FEATURES_append_spitz = " usbhost " -MACHINE_EXTRA_RDEPENDS = "zaurusd" +MACHINE_EXTRA_RDEPENDS = "zaurusd mtd-utils nandlogical" + +# Fixme ? +######### +# Here we just need snd modules MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" -MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" +MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" -GUI_MACHINE_CLASS = "bigscreen" -GUI_MACHINE_CLASS_poodle = "smallscreen" - KERNEL_IMAGE_MAXSIZE = "1294336" ZAURUS_KERNEL_IMAGETYPE ?= "zImage" diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index c3bbca856a..34e803e418 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -1,11 +1,5 @@ include conf/machine/include/tune-xscale.inc -UBOOT_ENTRYPOINT_c7x0 = "0xA0008000" -UBOOT_ENTRYPOINT_akita = "0xA1000000" -UBOOT_ENTRYPOINT_spitz = "0xA1000000" - -UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" - EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700" |