From b55d713e016c253d5b471eeefd239c5c4d9a1090 Mon Sep 17 00:00:00 2001 From: Frederic Bompart Date: Mon, 3 Oct 2005 16:09:26 +0000 Subject: simpad can be built with kernel 2.4 or 2.6 (default is 2.4, set KERNEL_VERSION=2.6 in local.conf to change this). Copied from the zaurus machine conf files. --- conf/machine/simpad-2.4.conf | 16 ++++++++++++++++ conf/machine/simpad-2.6.conf | 9 +++++++++ conf/machine/simpad.conf | 11 ++++------- 3 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 conf/machine/simpad-2.4.conf create mode 100644 conf/machine/simpad-2.6.conf (limited to 'conf') diff --git a/conf/machine/simpad-2.4.conf b/conf/machine/simpad-2.4.conf new file mode 100644 index 0000000000..a26bc5c04e --- /dev/null +++ b/conf/machine/simpad-2.4.conf @@ -0,0 +1,16 @@ +PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0" + +# Later versions are broken on kernel 2.4 +PREFERRED_VERSION_orinoco-modules = "0.13e" + +BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules \ +pcmcia-cs apmd hostap-utils \ +wpa-supplicant-nossl" + +BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules \ +orinoco-modules-cs pcmcia-cs apm hostap-utils \ +wpa-supplicant-nossl" + +BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ +kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ +kernel-module-pcnet-cs kernel-module-8390" diff --git a/conf/machine/simpad-2.6.conf b/conf/machine/simpad-2.6.conf new file mode 100644 index 0000000000..1a5bd38989 --- /dev/null +++ b/conf/machine/simpad-2.6.conf @@ -0,0 +1,9 @@ +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" + +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" + +BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel hostap-modules hostap-utils orinoco-modules wpa-supplicant-nossl" +BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel" +BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ +kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ +kernel-module-pcnet-cs kernel-module-8390" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 119e11b064..0447099204 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -5,14 +5,9 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel hostap-modules orinoco-modules " -BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel" -BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ -kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ -kernel-module-pcnet-cs kernel-module-8390" +KERNEL_VERSION ?= "2.4" +include conf/machine/simpad-${KERNEL_VERSION}.conf # This is needed for the ramdisk script to work BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs" @@ -26,6 +21,8 @@ USE_DEVFS = "1" GUI_MACHINE_CLASS = "bigscreen" ROOT_FLASH_SIZE = "24" USE_VT = "0" +GPE_EXTRA_DEPENDS += "gaim sylpheed" +GPE_EXTRA_INSTALL += "gaim sylpheed" include conf/machine/handheld-common.conf include conf/machine/tune-strongarm.conf -- cgit v1.2.3 From 93c2184153baccba88e31c0c73c833311a784783 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Oct 2005 17:49:48 +0000 Subject: conf/machine/h2200.conf: adjust jffs2 params --- conf/machine/h2200.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index bb65f151a2..a95312e411 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -9,7 +9,7 @@ IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -EXTRA_IMAGECMD_h2200_jffs2 = "-e 0x40000 -p" +EXTRA_IMAGECMD_h2200_jffs2 = "--pad --no-cleanmarkers --pagesize=512 --eraseblock=16384" ROOT_FLASH_SIZE = "32" -- cgit v1.2.3 From f26a6bdca05c47c5ac6f56cffdc95f09e42aaae1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Oct 2005 18:05:02 +0000 Subject: conf/machine/h2200.conf: add autoload statements, courtesy Matt Reimer --- conf/machine/h2200.conf | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index a95312e411..17735383d4 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -18,8 +18,23 @@ BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H2200_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" +#ship in rootfs: H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc pm pcmcia-core snd-pxa-i2sound-h2200 pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop " -# pxa2xx_udc is built in to the kernel + +#autoload on boot: +module_autoload_h2200_pm = "h2200_pm" +module_autoload_h2200_kbd = "h2200_kbd" +module_autoload_h2200_lcd = "h2200_lcd" +module_autoload_mq11xx_base = "mq11xx_base" +module_autoload_mq1100fb = "mq1100fb" +module_autoload_samcop_adcts = "samcop_adcts" +module_autoload_samcop_sdi = "samcop_sdi" +module_autoload_w1_ds2760 = "w1_ds2760" +module_autoload_h2200_battery = "h2200_battery" +module_autoload_hamcop_nand = "hamcop_nand" +module_autoload_pxa2xx_h2200 = "pxa2xx_h2200" +module_autoload_snd_pxa_i2sound_h2200 = "snd-pxa-i2sound-h2200" + SERIAL_CONSOLE = "115200 tts/0 vt100" @@ -30,5 +45,4 @@ include conf/machine/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" -# not using tune-xscale so as to retain backwards compatibility include conf/machine/tune-xscale.conf -- cgit v1.2.3 From a87f32891d055ce760ae9b51604a362df4bd1545 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Oct 2005 18:06:01 +0000 Subject: conf/machine/h2200.conf: 20:04 < mreimer> koen: also, I think you want to change 'pm' in H2200_MODULES to 'apm' --- conf/machine/h2200.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 17735383d4..47e7bdbc28 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -19,7 +19,7 @@ BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${ BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools" #ship in rootfs: -H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc pm pcmcia-core snd-pxa-i2sound-h2200 pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop " +H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc apm pcmcia-core snd-pxa-i2sound-h2200 pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop " #autoload on boot: module_autoload_h2200_pm = "h2200_pm" -- cgit v1.2.3 From 3ff7b2a5cbb65798ab1257526ed09dd44f7e5ef3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 3 Oct 2005 18:44:53 +0000 Subject: disapproval of revision 2c7d22fd4425878d42417193c1900d5174f3024a --- conf/machine/simpad-2.4.conf | 16 ---------------- conf/machine/simpad-2.6.conf | 9 --------- conf/machine/simpad.conf | 11 +++++++---- 3 files changed, 7 insertions(+), 29 deletions(-) delete mode 100644 conf/machine/simpad-2.4.conf delete mode 100644 conf/machine/simpad-2.6.conf (limited to 'conf') diff --git a/conf/machine/simpad-2.4.conf b/conf/machine/simpad-2.4.conf deleted file mode 100644 index a26bc5c04e..0000000000 --- a/conf/machine/simpad-2.4.conf +++ /dev/null @@ -1,16 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules \ -pcmcia-cs apmd hostap-utils \ -wpa-supplicant-nossl" - -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules \ -orinoco-modules-cs pcmcia-cs apm hostap-utils \ -wpa-supplicant-nossl" - -BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ -kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ -kernel-module-pcnet-cs kernel-module-8390" diff --git a/conf/machine/simpad-2.6.conf b/conf/machine/simpad-2.6.conf deleted file mode 100644 index 1a5bd38989..0000000000 --- a/conf/machine/simpad-2.6.conf +++ /dev/null @@ -1,9 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" - -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" - -BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel hostap-modules hostap-utils orinoco-modules wpa-supplicant-nossl" -BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel" -BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ -kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ -kernel-module-pcnet-cs kernel-module-8390" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 0447099204..119e11b064 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -5,9 +5,14 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" -KERNEL_VERSION ?= "2.4" -include conf/machine/simpad-${KERNEL_VERSION}.conf +BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel hostap-modules orinoco-modules " +BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel" +BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ +kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ +kernel-module-pcnet-cs kernel-module-8390" # This is needed for the ramdisk script to work BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs" @@ -21,8 +26,6 @@ USE_DEVFS = "1" GUI_MACHINE_CLASS = "bigscreen" ROOT_FLASH_SIZE = "24" USE_VT = "0" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" include conf/machine/handheld-common.conf include conf/machine/tune-strongarm.conf -- cgit v1.2.3