diff options
| -rw-r--r-- | conf/machine/include/palm.conf | 89 | ||||
| -rw-r--r-- | conf/machine/palmld.conf | 80 | ||||
| -rw-r--r-- | conf/machine/palmtt3.conf | 19 | ||||
| -rw-r--r-- | conf/machine/palmtx.conf | 18 | ||||
| -rw-r--r-- | conf/machine/palmz72.conf | 16 |
5 files changed, 97 insertions, 125 deletions
diff --git a/conf/machine/include/palm.conf b/conf/machine/include/palm.conf new file mode 100644 index 0000000000..2ddb808836 --- /dev/null +++ b/conf/machine/include/palm.conf @@ -0,0 +1,89 @@ +# +# Hardware-based properties +# + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" + +SERIAL_CONSOLE = "115200 ttyS0" + +GUI_MACHINE_CLASS = "bigscreen" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-xscale.conf + +MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth irda usbgadget screen ext2" + +# +# Software/packages selection +# + +PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" + +module_autoload_sa1100-rtc = "sa1100-rtc" +module_autoload_snd-ac97-bus = "snd-ac97-bus" +module_autoload_apm_power = "apm_power" +module_autoload_backlight = "backlight" +module_autoload_battery = "battery" +module_autoload_bcm2035_uart = "bcm2035_uart" +module_autoload_gpioed = "gpioed" +module_autoload_gpioed-ng = "gpioed-ng" +module_autoload_lcd = "lcd" +module_autoload_led-class = "led-class" +module_autoload_leds-palmld = "leds-palmld" +module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat" +module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer" +module_autoload_ledtrig-timer = "ledtrig-timer" +module_autoload_palmld_battery = "palmld-battery" +module_autoload_palmld_ide = "palmld-ide" +module_autoload_palmld_pcmcia = "palmld-pcmcia" +module_autoload_pcmcia = "pcmcia" +module_autoload_pcmcia_core = "pcmcia-core" +module_autoload_pda_power = "pda_power" +module_autoload_pxa2xx_core = "pxa2xx-core" +module_autoload_pxapwm_bl = "pxapwm_bl" +module_autoload_snd = "snd" +module_autoload_snd-ac97-codec = "snd-ac97-codec" +module_autoload_snd-mixer-oss = "snd-mixer-oss" +module_autoload_snd-page-alloc = "snd-page-alloc" +module_autoload_snd-pcm = "snd-pcm" +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm" +module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97" +module_autoload_snd-seq = "snd-seq" +module_autoload_snd-seq-device = "snd-seq-device" +module_autoload_seq-midi-event = "seq-midi-event" +module_autoload_snd-seq-oss = "snd-seq-oss" +module_autoload_snd-timer = "snd-timer" +module_autoload_soundcore = "soundcore" +module_autoload_wm97xx-ts = "wm97xx-ts" +module_autoload_pxa27x-keyboard = "pxa27x-keyboard" +module_autoload_palmtx-battery = "palmtx-battery" +module_autoload_palmz72_battery = "palmz72_battery" +module_autoload_i2c-dev = "i2c-dev" +module_autoload_i2c-pxa = "i2c-pxa" + + +MACHINE_EXTRA_RRECOMMENDS = "\ + kernel-module-ac97-bus \ + kernel-module-apm-power \ + kernel-module-backlight \ + kernel-module-battery \ + kernel-module-led-class \ + kernel-module-lcd \ + kernel-module-gpioed \ + kernel-module-gpioed-ng \ + kernel-module-external-power \ + kernel-module-snd \ + kernel-module-snd-ac97-codec \ + kernel-module-snd-page-alloc \ + kernel-module-snd-pcm \ + kernel-module-snd-seq \ + kernel-module-snd-seq-device \ + kernel-module-snd-seq-midi-event \ + kernel-module-snd-seq-oss \ + kernel-module-snd-timer \ + kernel-module-soundcore \ + " diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index 9857108472..99d85977b9 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -2,43 +2,15 @@ #@NAME: Palm LifeDrive #@DESCRIPTION: Machine configuration for the Palm LifeDrive -# -# Hardware-based properties -# - -TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" +require conf/machine/include/palm.conf ROOT_FLASH_SIZE = "100" -SERIAL_CONSOLE = "115200 ttyS0" - -GUI_MACHINE_CLASS = "bigscreen" - -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-xscale.conf - -MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth pcmcia irda wifi ext2 usbgadget screen" - -# -# Software/packages selection -# - -PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6" +MACHINE_FEATURES += "pcmcia wifi" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -MACHINE_EXTRA_RRECOMMENDS = "\ - kernel-module-ac97-bus \ - kernel-module-apm-power \ - kernel-module-backlight \ - kernel-module-battery \ +MACHINE_EXTRA_RRECOMMENDS += "\ kernel-module-bcm2035-uart \ - kernel-module-external-power \ - kernel-module-gpioed \ - kernel-module-gpioed-ng \ - kernel-module-lcd \ - kernel-module-led-class \ kernel-module-leds-palmld \ kernel-module-ledtrig-heartbeat \ kernel-module-ledtrig-hwtimer \ @@ -50,18 +22,8 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-pda-power \ kernel-module-pxa2xx-core \ kernel-module-pxapwm-bl \ - kernel-module-snd \ - kernel-module-snd-ac97-codec \ - kernel-module-snd-page-alloc \ - kernel-module-snd-pcm \ kernel-module-snd-pxa2xx-ac97 \ kernel-module-snd-pxa2xx-pcm \ - kernel-module-snd-seq \ - kernel-module-snd-seq-device \ - kernel-module-snd-seq-midi-event \ - kernel-module-snd-seq-oss \ - kernel-module-snd-timer \ - kernel-module-soundcore \ kernel-module-wm97xx-ts \ " @@ -71,39 +33,3 @@ MACHINE_EXTRA_RRECOMMENDS = "\ module_conf_wm97xx-ts = "options wm97xx-ts pil=2" -module_autoload_snd-ac97-bus = "snd-ac97-bus" -module_autoload_apm_power = "apm_power" -module_autoload_backlight = "backlight" -module_autoload_battery = "battery" -module_autoload_bcm2035_uart = "bcm2035_uart" -module_autoload_gpioed = "gpioed" -module_autoload_gpioed-ng = "gpioed-ng" -module_autoload_lcd = "lcd" -module_autoload_led-class = "led-class" -module_autoload_leds-palmld = "leds-palmld" -module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat" -module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer" -module_autoload_ledtrig-timer = "ledtrig-timer" -module_autoload_palmld_battery = "palmld-battery" -module_autoload_palmld_ide = "palmld-ide" -module_autoload_palmld_pcmcia = "palmld-pcmcia" -module_autoload_pcmcia = "pcmcia" -module_autoload_pcmcia_core = "pcmcia-core" -module_autoload_pda_power = "pda_power" -module_autoload_pxa2xx_core = "pxa2xx-core" -module_autoload_pxapwm_bl = "pxapwm_bl" -module_autoload_snd = "snd" -module_autoload_snd-ac97-codec = "snd-ac97-codec" -module_autoload_snd-mixer-oss = "snd-mixer-oss" -module_autoload_snd-page-alloc = "snd-page-alloc" -module_autoload_snd-pcm = "snd-pcm" -module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm" -module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97" -module_autoload_snd-seq = "snd-seq" -module_autoload_snd-seq-device = "snd-seq-device" -module_autoload_seq-midi-event = "seq-midi-event" -module_autoload_snd-seq-oss = "snd-seq-oss" -module_autoload_snd-timer = "snd-timer" -module_autoload_soundcore = "soundcore" -module_autoload_wm97xx-ts = "wm97xx-ts" diff --git a/conf/machine/palmtt3.conf b/conf/machine/palmtt3.conf index 8572838d2e..b4d65284ae 100644 --- a/conf/machine/palmtt3.conf +++ b/conf/machine/palmtt3.conf @@ -2,25 +2,8 @@ #@NAME: Palm Tungsten|T3 #@DESCRIPTION: Machine configuration for the Palm Tungsten|T3 -TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" - -PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6" -PREFERRED_PROVIDER_linux = "linux-hackndev-2.6" -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" -#SRCDATE_linux-hackndev-2.6 = "20070217" - -MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth ext2 usbgadget screen" +require conf/machine/include/palm.conf ROOT_FLASH_SIZE = "100" SERIAL_CONSOLE = "115200 ttyS3" - -GUI_MACHINE_CLASS = "bigscreen" - -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-xscale.conf - -module_autoload_sa1100-rtc = "sa1100-rtc" - -#EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --squash --eraseblock=0x10000 -n" diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf index a9b92ff7cc..4eb804aba0 100644 --- a/conf/machine/palmtx.conf +++ b/conf/machine/palmtx.conf @@ -2,14 +2,9 @@ #@NAME: Palm TX #@DESCRIPTION: Machine configuration for the Palm TX -TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t armv5te" +require conf/machine/include/palm.conf -PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6" - -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth wifi ext2 usbgadget screen" +MACHINE_FEATURES += "pcmcia wifi" ROOT_FLASH_SIZE = "100" @@ -17,16 +12,7 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-xscale.conf - MACHINE_EXTRA_RRECOMMENDS += "kernel-module-pxa27x-keyboard \ kernel-module-pxapwm-bl \ kernel-module-wm97xx-ts \ kernel-module-palmtx-battery" - -module_autoload_sa1100-rtc = "sa1100-rtc" -module_autoload_pxa27x-keyboard = "pxa27x-keyboard" -module_autoload_pxapwm-bl = "pxapwm-bl" -module_autoload_wm97xx-ts = "wm97xx-ts" -module_autoload_palmtx-battery = "palmtx-battery" diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf index 3017d9da31..8bcdfc0eef 100644 --- a/conf/machine/palmz72.conf +++ b/conf/machine/palmz72.conf @@ -2,14 +2,7 @@ #@NAME: Palm Zire 72 #@DESCRIPTION: Machine configuration for the Palm Zire 72 -TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" - -PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6" - -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda ext2 usbgadget screen" +require conf/machine/include/palm.conf ROOT_FLASH_SIZE = "100" @@ -18,18 +11,13 @@ SERIAL_CONSOLE = "115200 ttyS0" GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -require conf/machine/include/tune-xscale.conf require conf/machine/include/tune-thumb.conf -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-i2c-pxa \ +MACHINE_EXTRA_RRECOMMENDS += "kernel-module-i2c-pxa \ kernel-module-i2c-core \ kernel-module-i2c-algo-pxa \ kernel-module-i2c-dev \ kernel-module-palmz72-battery" -module_autoload_sa1100-rtc = "sa1100-rtc" -module_autoload_palmz72_battery = "palmz72_battery" -module_autoload_i2c-dev = "i2c-dev" -module_autoload_i2c-pxa = "i2c-pxa" module_autoload_g_ether = "g_ether" |