From f5e12396ab339e59679231b80a0ff2d4873f06c2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 17 Oct 2006 06:40:38 +0000 Subject: h5xxx: rename machine back to its original name * renaming machines breaks overrides. In this case the kernel couldn't find its defconfig * renaming machines breaks ipkg since existing installations don't know about the new arch * renaming machines breaks existing distributions So please don't rename machines without providing an upgrade path --- conf/machine/h5000.conf | 33 --------------------------------- conf/machine/h5xxx.conf | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 conf/machine/h5000.conf create mode 100644 conf/machine/h5xxx.conf diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf deleted file mode 100644 index 0e9165903b..0000000000 --- a/conf/machine/h5000.conf +++ /dev/null @@ -1,33 +0,0 @@ -#@TYPE: Machine -#@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx -#@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices - -# -# Hardware-based properties -# -TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" - -require conf/machine/include/tune-xscale.conf - -ROOT_FLASH_SIZE = "32" -VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" - -# -# Software/packages selection -# -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" - -MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ - kernel-module-h5400_battery" - -# -# Modules autoload and other boot properties -# -SERIAL_CONSOLE = "115200 tts/0 vt100" -USE_VT = "0" diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf new file mode 100644 index 0000000000..0e9165903b --- /dev/null +++ b/conf/machine/h5xxx.conf @@ -0,0 +1,33 @@ +#@TYPE: Machine +#@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx +#@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices + +# +# Hardware-based properties +# +TARGET_ARCH = "arm" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" + +require conf/machine/include/tune-xscale.conf + +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" + +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" + +MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ + kernel-module-h5400_battery" + +# +# Modules autoload and other boot properties +# +SERIAL_CONSOLE = "115200 tts/0 vt100" +USE_VT = "0" -- cgit v1.2.3