diff options
author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-10-07 18:26:48 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-10-07 18:26:48 +0000 |
commit | e3a5b67ddac4e60d9d298e31b130406830b646fd (patch) | |
tree | 70323633627600ba41dda93aeb535ed7a9c54bad /packages | |
parent | e307ea2a862bd308504b3f18fb688423b9a87215 (diff) |
linux 2.6.22: merge cm-x270 kernel (from compulab-pxa270 recipe)
Diffstat (limited to 'packages')
-rw-r--r-- | packages/linux/compulab-pxa270_2.6.22.bb | 67 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/.mtn2git_empty (renamed from packages/linux/compulab-pxa270-2.6.22/.mtn2git_empty) | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/0001-cm-x270-base2.patch (renamed from packages/linux/compulab-pxa270-2.6.22/0001-cm-x270-base2.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/0002-cm-x270-match-type.patch (renamed from packages/linux/compulab-pxa270-2.6.22/0002-cm-x270-match-type.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/0003-cm-x270-ide.patch (renamed from packages/linux/compulab-pxa270-2.6.22/0003-cm-x270-ide.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/0004-cm-x270-it8152.patch (renamed from packages/linux/compulab-pxa270-2.6.22/0004-cm-x270-it8152.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/0005-cm-x270-pcmcia.patch (renamed from packages/linux/compulab-pxa270-2.6.22/0005-cm-x270-pcmcia.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/0006-ramdisk_load.patch (renamed from packages/linux/compulab-pxa270-2.6.22/0006-ramdisk_load.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/0007-mmcsd_large_cards-r0.patch (renamed from packages/linux/compulab-pxa270-2.6.22/0007-mmcsd_large_cards-r0.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/0008-cm-x270-nand-simplify-name.patch (renamed from packages/linux/compulab-pxa270-2.6.22/0008-cm-x270-nand-simplify-name.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/0009-cursor-fix.patch (renamed from packages/linux/compulab-pxa270-2.6.22/0009-cursor-fix.patch) | 0 | ||||
-rw-r--r-- | packages/linux/linux-2.6.22/cm-x270/defconfig (renamed from packages/linux/compulab-pxa270-2.6.22/defconfig) | 0 | ||||
-rw-r--r-- | packages/linux/linux_2.6.22.bb | 43 |
14 files changed, 43 insertions, 67 deletions
diff --git a/packages/linux/compulab-pxa270_2.6.22.bb b/packages/linux/compulab-pxa270_2.6.22.bb deleted file mode 100644 index 84c1c63367..0000000000 --- a/packages/linux/compulab-pxa270_2.6.22.bb +++ /dev/null @@ -1,67 +0,0 @@ -require linux.inc - -SECTION = "kernel" -DESCRIPTION = "Linux kernel for the Compulab PXA270 system" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://0001-cm-x270-base2.patch;patch=1 \ - file://0002-cm-x270-match-type.patch;patch=1 \ - file://0003-cm-x270-ide.patch;patch=1 \ - file://0004-cm-x270-it8152.patch;patch=1 \ - file://0005-cm-x270-pcmcia.patch;patch=1 \ - file://0006-ramdisk_load.patch;patch=1 \ - file://0007-mmcsd_large_cards-r0.patch;patch=1 \ - file://0008-cm-x270-nand-simplify-name.patch;patch=1 \ - file://defconfig \ - " - -# file://0009-cursor-fix.patch - - - -# Note, for 2.6.22, we are no longer using the compulab binary -# flash driver -- use JFFS2 instead -# see notes in conf/machine/compulab-pxa270.conf - -S = "${WORKDIR}/linux-${PV}" - -COMPATIBLE_HOST = 'arm.*-linux' -COMPATIBLE_MACHINE = "cm-x270" - -CMDLINE = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" - -inherit kernel -inherit package - -ARCH = "arm" - -FILES_kernel-image = "" - -python do_compulab_image() { - import os - import os.path - import struct - - deploy_dir = bb.data.getVar('DEPLOY_DIR_IMAGE', d, 1) - kernel_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.bin') - img_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.cmx270') - - fo = open(img_file, 'wb') - - image_data = open(kernel_file, 'rb').read() - - # first write size into first 4 bytes - size_s = struct.pack('i', len(image_data)) - - # truncate size if we are running on a 64-bit host - size_s = size_s[:4] - - fo.write(size_s) - fo.write(image_data) - fo.close() -} - -addtask compulab_image after do_deploy before do_package - diff --git a/packages/linux/compulab-pxa270-2.6.22/.mtn2git_empty b/packages/linux/linux-2.6.22/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/linux/compulab-pxa270-2.6.22/.mtn2git_empty +++ b/packages/linux/linux-2.6.22/.mtn2git_empty diff --git a/packages/linux/linux-2.6.22/cm-x270/.mtn2git_empty b/packages/linux/linux-2.6.22/cm-x270/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-2.6.22/cm-x270/.mtn2git_empty diff --git a/packages/linux/compulab-pxa270-2.6.22/0001-cm-x270-base2.patch b/packages/linux/linux-2.6.22/cm-x270/0001-cm-x270-base2.patch index 9a635c5cbc..9a635c5cbc 100644 --- a/packages/linux/compulab-pxa270-2.6.22/0001-cm-x270-base2.patch +++ b/packages/linux/linux-2.6.22/cm-x270/0001-cm-x270-base2.patch diff --git a/packages/linux/compulab-pxa270-2.6.22/0002-cm-x270-match-type.patch b/packages/linux/linux-2.6.22/cm-x270/0002-cm-x270-match-type.patch index 68da30191c..68da30191c 100644 --- a/packages/linux/compulab-pxa270-2.6.22/0002-cm-x270-match-type.patch +++ b/packages/linux/linux-2.6.22/cm-x270/0002-cm-x270-match-type.patch diff --git a/packages/linux/compulab-pxa270-2.6.22/0003-cm-x270-ide.patch b/packages/linux/linux-2.6.22/cm-x270/0003-cm-x270-ide.patch index 0ff115efc8..0ff115efc8 100644 --- a/packages/linux/compulab-pxa270-2.6.22/0003-cm-x270-ide.patch +++ b/packages/linux/linux-2.6.22/cm-x270/0003-cm-x270-ide.patch diff --git a/packages/linux/compulab-pxa270-2.6.22/0004-cm-x270-it8152.patch b/packages/linux/linux-2.6.22/cm-x270/0004-cm-x270-it8152.patch index 274eaf24d8..274eaf24d8 100644 --- a/packages/linux/compulab-pxa270-2.6.22/0004-cm-x270-it8152.patch +++ b/packages/linux/linux-2.6.22/cm-x270/0004-cm-x270-it8152.patch diff --git a/packages/linux/compulab-pxa270-2.6.22/0005-cm-x270-pcmcia.patch b/packages/linux/linux-2.6.22/cm-x270/0005-cm-x270-pcmcia.patch index 7dceff5c9d..7dceff5c9d 100644 --- a/packages/linux/compulab-pxa270-2.6.22/0005-cm-x270-pcmcia.patch +++ b/packages/linux/linux-2.6.22/cm-x270/0005-cm-x270-pcmcia.patch diff --git a/packages/linux/compulab-pxa270-2.6.22/0006-ramdisk_load.patch b/packages/linux/linux-2.6.22/cm-x270/0006-ramdisk_load.patch index aa25dd9bfc..aa25dd9bfc 100644 --- a/packages/linux/compulab-pxa270-2.6.22/0006-ramdisk_load.patch +++ b/packages/linux/linux-2.6.22/cm-x270/0006-ramdisk_load.patch diff --git a/packages/linux/compulab-pxa270-2.6.22/0007-mmcsd_large_cards-r0.patch b/packages/linux/linux-2.6.22/cm-x270/0007-mmcsd_large_cards-r0.patch index 90e66b5308..90e66b5308 100644 --- a/packages/linux/compulab-pxa270-2.6.22/0007-mmcsd_large_cards-r0.patch +++ b/packages/linux/linux-2.6.22/cm-x270/0007-mmcsd_large_cards-r0.patch diff --git a/packages/linux/compulab-pxa270-2.6.22/0008-cm-x270-nand-simplify-name.patch b/packages/linux/linux-2.6.22/cm-x270/0008-cm-x270-nand-simplify-name.patch index c07f049e56..c07f049e56 100644 --- a/packages/linux/compulab-pxa270-2.6.22/0008-cm-x270-nand-simplify-name.patch +++ b/packages/linux/linux-2.6.22/cm-x270/0008-cm-x270-nand-simplify-name.patch diff --git a/packages/linux/compulab-pxa270-2.6.22/0009-cursor-fix.patch b/packages/linux/linux-2.6.22/cm-x270/0009-cursor-fix.patch index 08b0db36b0..08b0db36b0 100644 --- a/packages/linux/compulab-pxa270-2.6.22/0009-cursor-fix.patch +++ b/packages/linux/linux-2.6.22/cm-x270/0009-cursor-fix.patch diff --git a/packages/linux/compulab-pxa270-2.6.22/defconfig b/packages/linux/linux-2.6.22/cm-x270/defconfig index 63bc69533f..63bc69533f 100644 --- a/packages/linux/compulab-pxa270-2.6.22/defconfig +++ b/packages/linux/linux-2.6.22/cm-x270/defconfig diff --git a/packages/linux/linux_2.6.22.bb b/packages/linux/linux_2.6.22.bb index 64b57d3076..b33274d8bf 100644 --- a/packages/linux/linux_2.6.22.bb +++ b/packages/linux/linux_2.6.22.bb @@ -3,6 +3,7 @@ require linux.inc # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_avr32 = "1" +DEFAULT_PREFERENCE_cm-x270 = "1" PR = "r3" @@ -11,3 +12,45 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2 \ " SRC_URI_append_avr32 = "http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.22.atmel.3.patch.bz2;patch=1" + +SRC_URI_append_cm-x270 = "\ + file://0001-cm-x270-base2.patch;patch=1 \ + file://0002-cm-x270-match-type.patch;patch=1 \ + file://0003-cm-x270-ide.patch;patch=1 \ + file://0004-cm-x270-it8152.patch;patch=1 \ + file://0005-cm-x270-pcmcia.patch;patch=1 \ + file://0006-ramdisk_load.patch;patch=1 \ + file://0007-mmcsd_large_cards-r0.patch;patch=1 \ + file://0008-cm-x270-nand-simplify-name.patch;patch=1" + +CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" + +FILES_kernel-image_cm-x270 = "" + +python do_compulab_image() { + import os + import os.path + import struct + + machine = bb.data.getVar('MACHINE', d, 1) + if machine == "cm-x270": + deploy_dir = bb.data.getVar('DEPLOY_DIR_IMAGE', d, 1) + kernel_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.bin') + img_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.cmx270') + + fo = open(img_file, 'wb') + + image_data = open(kernel_file, 'rb').read() + + # first write size into first 4 bytes + size_s = struct.pack('i', len(image_data)) + + # truncate size if we are running on a 64-bit host + size_s = size_s[:4] + + fo.write(size_s) + fo.write(image_data) + fo.close() +} + +addtask compulab_image after do_deploy before do_package |