From aaef70f186aa239669269a8a4237b6d3dc99b5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Thu, 24 Sep 2009 19:10:28 +0200 Subject: linux-2.6.29: add devicetree image for boc01 v1 and v2 --- recipes/linux/linux-2.6.29/boc01/boc01.dts | 2 +- recipes/linux/linux-2.6.29/boc01/boc01.dts.v1 | 344 ++++++++++++++++++++++++++ recipes/linux/linux-2.6.29/boc01/boc02.dts | 344 -------------------------- recipes/linux/linux_2.6.29.bb | 16 +- 4 files changed, 360 insertions(+), 346 deletions(-) create mode 100644 recipes/linux/linux-2.6.29/boc01/boc01.dts.v1 delete mode 100644 recipes/linux/linux-2.6.29/boc01/boc02.dts diff --git a/recipes/linux/linux-2.6.29/boc01/boc01.dts b/recipes/linux/linux-2.6.29/boc01/boc01.dts index 2066652695..fb0b5fb0a5 100644 --- a/recipes/linux/linux-2.6.29/boc01/boc01.dts +++ b/recipes/linux/linux-2.6.29/boc01/boc01.dts @@ -194,7 +194,7 @@ compatible = "gianfar"; reg = <0x25000 0x1000>; local-mac-address = [ 00 00 00 00 00 00 ]; - interrupts = <34 0x8 33 0x8 32 0x8>; + interrupts = <35 0x8 36 0x8 37 0x8>; interrupt-parent = <&ipic>; fixed-link = <1 1 100 0 0>; sleep = <&pmc 0x10000000>; diff --git a/recipes/linux/linux-2.6.29/boc01/boc01.dts.v1 b/recipes/linux/linux-2.6.29/boc01/boc01.dts.v1 new file mode 100644 index 0000000000..2066652695 --- /dev/null +++ b/recipes/linux/linux-2.6.29/boc01/boc01.dts.v1 @@ -0,0 +1,344 @@ +/* + * Bolloré telecom CPE v01 Device Tree Source + * + * Copyright 2005, 2006, 2007 Freescale Semiconductor Inc. + * Copyright 2008, 2009 Bolloré telecom. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +/dts-v1/; + +/ { + model = "MPC8313ERDB"; + compatible = "MPC8313ERDB", "MPC831xRDB", "MPC83xxRDB"; + #address-cells = <1>; + #size-cells = <1>; + + aliases { + ethernet1 = &enet1; + serial0 = &serial0; + pci0 = &pci0; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + PowerPC,8313@0 { + device_type = "cpu"; + reg = <0x0>; + d-cache-line-size = <32>; + i-cache-line-size = <32>; + d-cache-size = <16384>; + i-cache-size = <16384>; + timebase-frequency = <0>; // from bootloader + bus-frequency = <0>; // from bootloader + clock-frequency = <0>; // from bootloader + }; + }; + + memory { + device_type = "memory"; + reg = <0x00000000 0x08000000>; // 128MB at 0 + }; + + localbus@e0005000 { + #address-cells = <2>; + #size-cells = <1>; + compatible = "fsl,mpc8313-elbc", "fsl,elbc", "simple-bus"; + reg = <0xe0005000 0x1000>; + interrupts = <77 0x8>; + interrupt-parent = <&ipic>; + + // CS0 and CS1 are swapped when + // booting from nand, but the + // addresses are the same. + ranges = <0x0 0x0 0xfe000000 0x00800000 + 0x1 0x0 0xe2800000 0x00008000 + 0x2 0x0 0xf0000000 0x00020000 + 0x3 0x0 0xfa000000 0x00008000>; + + flash@0,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "cfi-flash"; + reg = <0x0 0x0 0x800000>; + bank-width = <2>; + device-width = <1>; + }; + + nand@1,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,mpc8313-fcm-nand", + "fsl,elbc-fcm-nand"; + reg = <0x1 0x0 0x2000>; + + kernel@0 { + reg = <0x0 0x400000>; + read-only; + }; + + fs@400000 { + reg = <0x400000 0x4000000>; + }; + + appli@4400000 { + reg = <0x4400000 0x3c00000>; + }; + }; + }; + + soc8313@e0000000 { + #address-cells = <1>; + #size-cells = <1>; + device_type = "soc"; + compatible = "simple-bus"; + ranges = <0x0 0xe0000000 0x00100000>; + reg = <0xe0000000 0x00000200>; + bus-frequency = <0>; + + wdt@200 { + device_type = "watchdog"; + compatible = "mpc83xx_wdt"; + reg = <0x200 0x100>; + }; + + sleep-nexus { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + sleep = <&pmc 0x03000000>; + ranges; + + i2c@3000 { + #address-cells = <1>; + #size-cells = <0>; + cell-index = <0>; + compatible = "fsl-i2c"; + reg = <0x3000 0x100>; + interrupts = <14 0x8>; + interrupt-parent = <&ipic>; + dfsrr; + rtc@6f { + compatible = "isl12024"; + reg = <0x6f>; + }; + dtt@49 { + compatible = "national,lm73"; + reg = <0x49>; + }; + at24@50 { + compatible = "at24,24c32"; + reg = <0x50>; + }; + at24@57 { + compatible = "at24,isl12024"; + reg = <0x57>; + }; + }; + + crypto@30000 { + compatible = "fsl,sec2.2", "fsl,sec2.1", + "fsl,sec2.0"; + reg = <0x30000 0x10000>; + interrupts = <11 0x8>; + interrupt-parent = <&ipic>; + fsl,num-channels = <1>; + fsl,channel-fifo-len = <24>; + fsl,exec-units-mask = <0x4c>; + fsl,descriptor-types-mask = <0x0122003f>; + }; + }; + + i2c@3100 { + #address-cells = <1>; + #size-cells = <0>; + cell-index = <1>; + compatible = "fsl-i2c"; + reg = <0x3100 0x100>; + interrupts = <15 0x8>; + interrupt-parent = <&ipic>; + dfsrr; + }; + + spi@7000 { + cell-index = <0>; + compatible = "fsl,spi"; + reg = <0x7000 0x1000>; + interrupts = <16 0x8>; + interrupt-parent = <&ipic>; + mode = "cpu"; + }; + + /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ + usb@23000 { + compatible = "fsl-usb2-dr"; + reg = <0x23000 0x1000>; + #address-cells = <1>; + #size-cells = <0>; + interrupt-parent = <&ipic>; + interrupts = <38 0x8>; + phy_type = "utmi_wide"; + sleep = <&pmc 0x00300000>; + }; + + enet1: ethernet@25000 { + cell-index = <1>; + device_type = "network"; + model = "eTSEC"; + compatible = "gianfar"; + reg = <0x25000 0x1000>; + local-mac-address = [ 00 00 00 00 00 00 ]; + interrupts = <34 0x8 33 0x8 32 0x8>; + interrupt-parent = <&ipic>; + fixed-link = <1 1 100 0 0>; + sleep = <&pmc 0x10000000>; + fsl,magic-packet; + }; + + serial0: serial@4600 { + cell-index = <0>; + device_type = "serial"; + compatible = "ns16550"; + reg = <0x4600 0x100>; + clock-frequency = <0>; + interrupts = <10 0x8>; + interrupt-parent = <&ipic>; + }; + + /* IPIC + * interrupts cell = + * sense values match linux IORESOURCE_IRQ_* defines: + * sense == 8: Level, low assertion + * sense == 2: Edge, high-to-low change + */ + ipic: pic@700 { + interrupt-controller; + #address-cells = <0>; + #interrupt-cells = <2>; + reg = <0x700 0x100>; + device_type = "ipic"; + }; + + pmc: power@b00 { + compatible = "fsl,mpc8313-pmc", "fsl,mpc8349-pmc"; + reg = <0xb00 0x100 0xa00 0x100>; + interrupts = <80 8>; + interrupt-parent = <&ipic>; + fsl,mpc8313-wakeup-timer = <>m1>; + + /* Remove this (or change to "okay") if you have + * a REVA3 or later board, if you apply one of the + * workarounds listed in section 8.5 of the board + * manual, or if you are adapting this device tree + * to a different board. + */ + status = "okay"; + }; + + gtm1: timer@500 { + compatible = "fsl,mpc8313-gtm", "fsl,gtm"; + reg = <0x500 0x100>; + interrupts = <72 8 78 8 84 8 90 8>; + interrupt-parent = <&ipic>; + }; + + timer@600 { + compatible = "fsl,mpc8313-gtm", "fsl,gtm"; + reg = <0x600 0x100>; + interrupts = <91 8 79 8 85 8 73 8>; + interrupt-parent = <&ipic>; + }; + + wakeup@27000 { + compatible = "fsl,wakeup-it", "fsl,gtm"; + reg = <0x27000 0x100>; + interrupts = <17 8 19 8>; + interrupt-parent = <&ipic>; + }; + + }; + + sleep-nexus { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + sleep = <&pmc 0x00010000>; + ranges; + + pci0: pci@e0008500 { + cell-index = <1>; + interrupt-map-mask = <0xf800 0x0 0x0 0x7>; + interrupt-map = < + /* IDSEL 0x0F - PCI slot */ + 0x7800 0x0 0x0 0x1 &ipic 48 0x8 + 0x7800 0x0 0x0 0x2 &ipic 48 0x8 + 0x7800 0x0 0x0 0x3 &ipic 48 0x8 + 0x7800 0x0 0x0 0x4 &ipic 48 0x8>; + interrupt-parent = <&ipic>; + interrupts = <66 0x8>; + bus-range = <0x0 0x0>; + ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 + 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 + 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>; + clock-frequency = <66666666>; + #interrupt-cells = <1>; + #size-cells = <2>; + #address-cells = <3>; + reg = <0xe0008500 0x100>; + compatible = "fsl,mpc8349-pci"; + device_type = "pci"; + }; + + dma@82a8 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "fsl,mpc8313-dma", "fsl,elo-dma"; + reg = <0xe00082a8 4>; + ranges = <0 0xe0008100 0x1a8>; + interrupt-parent = <&ipic>; + interrupts = <71 8>; + + dma-channel@0 { + compatible = "fsl,mpc8313-dma-channel", + "fsl,elo-dma-channel"; + reg = <0 0x28>; + interrupt-parent = <&ipic>; + interrupts = <71 8>; + cell-index = <0>; + }; + + dma-channel@80 { + compatible = "fsl,mpc8313-dma-channel", + "fsl,elo-dma-channel"; + reg = <0x80 0x28>; + interrupt-parent = <&ipic>; + interrupts = <71 8>; + cell-index = <1>; + }; + + dma-channel@100 { + compatible = "fsl,mpc8313-dma-channel", + "fsl,elo-dma-channel"; + reg = <0x100 0x28>; + interrupt-parent = <&ipic>; + interrupts = <71 8>; + cell-index = <2>; + }; + + dma-channel@180 { + compatible = "fsl,mpc8313-dma-channel", + "fsl,elo-dma-channel"; + reg = <0x180 0x28>; + interrupt-parent = <&ipic>; + interrupts = <71 8>; + cell-index = <3>; + }; + }; + }; +}; diff --git a/recipes/linux/linux-2.6.29/boc01/boc02.dts b/recipes/linux/linux-2.6.29/boc01/boc02.dts deleted file mode 100644 index fb0b5fb0a5..0000000000 --- a/recipes/linux/linux-2.6.29/boc01/boc02.dts +++ /dev/null @@ -1,344 +0,0 @@ -/* - * Bolloré telecom CPE v01 Device Tree Source - * - * Copyright 2005, 2006, 2007 Freescale Semiconductor Inc. - * Copyright 2008, 2009 Bolloré telecom. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ - -/dts-v1/; - -/ { - model = "MPC8313ERDB"; - compatible = "MPC8313ERDB", "MPC831xRDB", "MPC83xxRDB"; - #address-cells = <1>; - #size-cells = <1>; - - aliases { - ethernet1 = &enet1; - serial0 = &serial0; - pci0 = &pci0; - }; - - cpus { - #address-cells = <1>; - #size-cells = <0>; - - PowerPC,8313@0 { - device_type = "cpu"; - reg = <0x0>; - d-cache-line-size = <32>; - i-cache-line-size = <32>; - d-cache-size = <16384>; - i-cache-size = <16384>; - timebase-frequency = <0>; // from bootloader - bus-frequency = <0>; // from bootloader - clock-frequency = <0>; // from bootloader - }; - }; - - memory { - device_type = "memory"; - reg = <0x00000000 0x08000000>; // 128MB at 0 - }; - - localbus@e0005000 { - #address-cells = <2>; - #size-cells = <1>; - compatible = "fsl,mpc8313-elbc", "fsl,elbc", "simple-bus"; - reg = <0xe0005000 0x1000>; - interrupts = <77 0x8>; - interrupt-parent = <&ipic>; - - // CS0 and CS1 are swapped when - // booting from nand, but the - // addresses are the same. - ranges = <0x0 0x0 0xfe000000 0x00800000 - 0x1 0x0 0xe2800000 0x00008000 - 0x2 0x0 0xf0000000 0x00020000 - 0x3 0x0 0xfa000000 0x00008000>; - - flash@0,0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "cfi-flash"; - reg = <0x0 0x0 0x800000>; - bank-width = <2>; - device-width = <1>; - }; - - nand@1,0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "fsl,mpc8313-fcm-nand", - "fsl,elbc-fcm-nand"; - reg = <0x1 0x0 0x2000>; - - kernel@0 { - reg = <0x0 0x400000>; - read-only; - }; - - fs@400000 { - reg = <0x400000 0x4000000>; - }; - - appli@4400000 { - reg = <0x4400000 0x3c00000>; - }; - }; - }; - - soc8313@e0000000 { - #address-cells = <1>; - #size-cells = <1>; - device_type = "soc"; - compatible = "simple-bus"; - ranges = <0x0 0xe0000000 0x00100000>; - reg = <0xe0000000 0x00000200>; - bus-frequency = <0>; - - wdt@200 { - device_type = "watchdog"; - compatible = "mpc83xx_wdt"; - reg = <0x200 0x100>; - }; - - sleep-nexus { - #address-cells = <1>; - #size-cells = <1>; - compatible = "simple-bus"; - sleep = <&pmc 0x03000000>; - ranges; - - i2c@3000 { - #address-cells = <1>; - #size-cells = <0>; - cell-index = <0>; - compatible = "fsl-i2c"; - reg = <0x3000 0x100>; - interrupts = <14 0x8>; - interrupt-parent = <&ipic>; - dfsrr; - rtc@6f { - compatible = "isl12024"; - reg = <0x6f>; - }; - dtt@49 { - compatible = "national,lm73"; - reg = <0x49>; - }; - at24@50 { - compatible = "at24,24c32"; - reg = <0x50>; - }; - at24@57 { - compatible = "at24,isl12024"; - reg = <0x57>; - }; - }; - - crypto@30000 { - compatible = "fsl,sec2.2", "fsl,sec2.1", - "fsl,sec2.0"; - reg = <0x30000 0x10000>; - interrupts = <11 0x8>; - interrupt-parent = <&ipic>; - fsl,num-channels = <1>; - fsl,channel-fifo-len = <24>; - fsl,exec-units-mask = <0x4c>; - fsl,descriptor-types-mask = <0x0122003f>; - }; - }; - - i2c@3100 { - #address-cells = <1>; - #size-cells = <0>; - cell-index = <1>; - compatible = "fsl-i2c"; - reg = <0x3100 0x100>; - interrupts = <15 0x8>; - interrupt-parent = <&ipic>; - dfsrr; - }; - - spi@7000 { - cell-index = <0>; - compatible = "fsl,spi"; - reg = <0x7000 0x1000>; - interrupts = <16 0x8>; - interrupt-parent = <&ipic>; - mode = "cpu"; - }; - - /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */ - usb@23000 { - compatible = "fsl-usb2-dr"; - reg = <0x23000 0x1000>; - #address-cells = <1>; - #size-cells = <0>; - interrupt-parent = <&ipic>; - interrupts = <38 0x8>; - phy_type = "utmi_wide"; - sleep = <&pmc 0x00300000>; - }; - - enet1: ethernet@25000 { - cell-index = <1>; - device_type = "network"; - model = "eTSEC"; - compatible = "gianfar"; - reg = <0x25000 0x1000>; - local-mac-address = [ 00 00 00 00 00 00 ]; - interrupts = <35 0x8 36 0x8 37 0x8>; - interrupt-parent = <&ipic>; - fixed-link = <1 1 100 0 0>; - sleep = <&pmc 0x10000000>; - fsl,magic-packet; - }; - - serial0: serial@4600 { - cell-index = <0>; - device_type = "serial"; - compatible = "ns16550"; - reg = <0x4600 0x100>; - clock-frequency = <0>; - interrupts = <10 0x8>; - interrupt-parent = <&ipic>; - }; - - /* IPIC - * interrupts cell = - * sense values match linux IORESOURCE_IRQ_* defines: - * sense == 8: Level, low assertion - * sense == 2: Edge, high-to-low change - */ - ipic: pic@700 { - interrupt-controller; - #address-cells = <0>; - #interrupt-cells = <2>; - reg = <0x700 0x100>; - device_type = "ipic"; - }; - - pmc: power@b00 { - compatible = "fsl,mpc8313-pmc", "fsl,mpc8349-pmc"; - reg = <0xb00 0x100 0xa00 0x100>; - interrupts = <80 8>; - interrupt-parent = <&ipic>; - fsl,mpc8313-wakeup-timer = <>m1>; - - /* Remove this (or change to "okay") if you have - * a REVA3 or later board, if you apply one of the - * workarounds listed in section 8.5 of the board - * manual, or if you are adapting this device tree - * to a different board. - */ - status = "okay"; - }; - - gtm1: timer@500 { - compatible = "fsl,mpc8313-gtm", "fsl,gtm"; - reg = <0x500 0x100>; - interrupts = <72 8 78 8 84 8 90 8>; - interrupt-parent = <&ipic>; - }; - - timer@600 { - compatible = "fsl,mpc8313-gtm", "fsl,gtm"; - reg = <0x600 0x100>; - interrupts = <91 8 79 8 85 8 73 8>; - interrupt-parent = <&ipic>; - }; - - wakeup@27000 { - compatible = "fsl,wakeup-it", "fsl,gtm"; - reg = <0x27000 0x100>; - interrupts = <17 8 19 8>; - interrupt-parent = <&ipic>; - }; - - }; - - sleep-nexus { - #address-cells = <1>; - #size-cells = <1>; - compatible = "simple-bus"; - sleep = <&pmc 0x00010000>; - ranges; - - pci0: pci@e0008500 { - cell-index = <1>; - interrupt-map-mask = <0xf800 0x0 0x0 0x7>; - interrupt-map = < - /* IDSEL 0x0F - PCI slot */ - 0x7800 0x0 0x0 0x1 &ipic 48 0x8 - 0x7800 0x0 0x0 0x2 &ipic 48 0x8 - 0x7800 0x0 0x0 0x3 &ipic 48 0x8 - 0x7800 0x0 0x0 0x4 &ipic 48 0x8>; - interrupt-parent = <&ipic>; - interrupts = <66 0x8>; - bus-range = <0x0 0x0>; - ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000 - 0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000 - 0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>; - clock-frequency = <66666666>; - #interrupt-cells = <1>; - #size-cells = <2>; - #address-cells = <3>; - reg = <0xe0008500 0x100>; - compatible = "fsl,mpc8349-pci"; - device_type = "pci"; - }; - - dma@82a8 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "fsl,mpc8313-dma", "fsl,elo-dma"; - reg = <0xe00082a8 4>; - ranges = <0 0xe0008100 0x1a8>; - interrupt-parent = <&ipic>; - interrupts = <71 8>; - - dma-channel@0 { - compatible = "fsl,mpc8313-dma-channel", - "fsl,elo-dma-channel"; - reg = <0 0x28>; - interrupt-parent = <&ipic>; - interrupts = <71 8>; - cell-index = <0>; - }; - - dma-channel@80 { - compatible = "fsl,mpc8313-dma-channel", - "fsl,elo-dma-channel"; - reg = <0x80 0x28>; - interrupt-parent = <&ipic>; - interrupts = <71 8>; - cell-index = <1>; - }; - - dma-channel@100 { - compatible = "fsl,mpc8313-dma-channel", - "fsl,elo-dma-channel"; - reg = <0x100 0x28>; - interrupt-parent = <&ipic>; - interrupts = <71 8>; - cell-index = <2>; - }; - - dma-channel@180 { - compatible = "fsl,mpc8313-dma-channel", - "fsl,elo-dma-channel"; - reg = <0x180 0x28>; - interrupt-parent = <&ipic>; - interrupts = <71 8>; - cell-index = <3>; - }; - }; - }; -}; diff --git a/recipes/linux/linux_2.6.29.bb b/recipes/linux/linux_2.6.29.bb index 2e9e769820..ba50a9b3a2 100644 --- a/recipes/linux/linux_2.6.29.bb +++ b/recipes/linux/linux_2.6.29.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r8" +PR = "r9" S = "${WORKDIR}/linux-2.6.29" @@ -23,6 +23,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 \ SRC_URI_append_boc01 = "\ file://boc01.dts \ + file://boc01.dts.v1 \ file://004-081205-usb.patch;patch=1 \ file://005-090226-isl12024.patch;patch=1 \ file://007-090825-lm73.patch;patch=1 \ @@ -73,3 +74,16 @@ SRC_URI_append_stamp9g20evb = " \ CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),0x230000(root),-(config);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd4 rootfstype=jffs2" +do_devicetree_image_append_boc01() { + dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree.v1 ${KERNEL_DEVICETREE}.v1 + install -m 0644 devicetree.v1 ${D}/boot/devicetree-${KERNEL_VERSION}.v1 +} + +pkg_postinst_kernel-devicetree_append_boc01 () { + cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/devicetree.v1 devicetree.v1 devicetree-${KERNEL_VERSION}.v1 ${KERNEL_PRIORITY} || true +} + +pkg_postrm_kernel-devicetree_append_boc01 () { + cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree.v1 devicetree-${KERNEL_VERSION}.v1 || true +} + -- cgit v1.2.3 From 224deea993f8e20053cd05b6a31e56133e959263 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 24 Sep 2009 23:01:54 +0200 Subject: kexec-tools_2.0: bump to 2.01 (lot of fixes !)- update checksums.ini --- conf/checksums.ini | 6 +++--- recipes/kexec/kexec-tools-klibc-static_2.0.0.bb | 24 ------------------------ recipes/kexec/kexec-tools-klibc-static_2.0.1.bb | 24 ++++++++++++++++++++++++ recipes/kexec/kexec-tools_2.0.0.bb | 7 ------- recipes/kexec/kexec-tools_2.0.1.bb | 7 +++++++ 5 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 recipes/kexec/kexec-tools-klibc-static_2.0.0.bb create mode 100644 recipes/kexec/kexec-tools-klibc-static_2.0.1.bb delete mode 100644 recipes/kexec/kexec-tools_2.0.0.bb create mode 100644 recipes/kexec/kexec-tools_2.0.1.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index ed3f12e0e7..ac0f85e222 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -12298,9 +12298,9 @@ sha256=a758c8f9b55d8288e2484dd1a2dcbd9c4ca3ca3052864a45cb104f613b7f712d md5=b4f7ffcc294d41a6a4c40d6e44b7734d sha256=280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38 -[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.0.tar.gz] -md5=bf87c53f36b4454ad3cc50aa9c72faf3 -sha256=f8244b8c4691faf0c9765ec3acba730a5620c8077f9bed667b9ac835dd959ba2 +[http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-2.0.1.tar.gz] +md5=a7710a89fb0096002bccc57ab202a874 +sha256=95f352870df977271d912b6093f034bd3345e47a157493db96d1047b7654564d [http://kexecboot.home.linuxtogo.org/kexecboot-0.3.tar.gz] md5=3c3b8edb739146183b3ddff3e0af5f1c diff --git a/recipes/kexec/kexec-tools-klibc-static_2.0.0.bb b/recipes/kexec/kexec-tools-klibc-static_2.0.0.bb deleted file mode 100644 index da12db185b..0000000000 --- a/recipes/kexec/kexec-tools-klibc-static_2.0.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -# the binaries are statical linked against klibc -require kexec-tools2.inc - -DEFAULT_PREFERENCE = "-1" - -PR = "r0" -DEPENDS = "klibc" - -SRC_URI += "file://kexec2-klibc.patch;patch=1" -S = "${WORKDIR}/kexec-tools-${PV}" - -EXTRA_OECONF = " --without-zlib" - -export CC=${TARGET_PREFIX}klcc - -# standart oe cflags don't work with klcc -export CFLAGS="" -export CPPFLAGS="" -export LDFLAGS="" - -PACKAGES =+ "kexec-klibc-static kdump-klibc-static" - -FILES_kexec-klibc-static = "${sbindir}/kexec" -FILES_kdump-klibc-static = "${sbindir}/kdump" diff --git a/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb b/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb new file mode 100644 index 0000000000..52f69fec62 --- /dev/null +++ b/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb @@ -0,0 +1,24 @@ +# the binaries are statical linked against klibc +require kexec-tools2.inc + +DEFAULT_PREFERENCE = "1" + +PR = "r0" +DEPENDS = "klibc" + +#SRC_URI += "file://kexec2-klibc.patch;patch=1" +S = "${WORKDIR}/kexec-tools-${PV}" + +EXTRA_OECONF = " --without-zlib" + +export CC=${TARGET_PREFIX}klcc + +# standart oe cflags don't work with klcc +export CFLAGS="" +export CPPFLAGS="" +export LDFLAGS="" + +PACKAGES =+ "kexec-klibc-static kdump-klibc-static" + +FILES_kexec-klibc-static = "${sbindir}/kexec" +FILES_kdump-klibc-static = "${sbindir}/kdump" diff --git a/recipes/kexec/kexec-tools_2.0.0.bb b/recipes/kexec/kexec-tools_2.0.0.bb deleted file mode 100644 index 7692081d24..0000000000 --- a/recipes/kexec/kexec-tools_2.0.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -require kexec-tools2.inc -export LDFLAGS = "-L${STAGING_LIBDIR}" -EXTRA_OECONF = " --with-zlib=yes" - -PR = "r0" - -DEFAULT_PREFERENCE = "-1" diff --git a/recipes/kexec/kexec-tools_2.0.1.bb b/recipes/kexec/kexec-tools_2.0.1.bb new file mode 100644 index 0000000000..8285b20133 --- /dev/null +++ b/recipes/kexec/kexec-tools_2.0.1.bb @@ -0,0 +1,7 @@ +require kexec-tools2.inc +export LDFLAGS = "-L${STAGING_LIBDIR}" +EXTRA_OECONF = " --with-zlib=yes" + +PR = "r0" + +DEFAULT_PREFERENCE = "1" -- cgit v1.2.3 From 6217640e60ce8f85c914b0804af8429ff035972a Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Thu, 24 Sep 2009 23:12:15 +0200 Subject: kexec-tools-klibc-static_2.0.1: recipe is unstable, WIP. Lower def pref. --- recipes/kexec/kexec-tools-klibc-static_2.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb b/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb index 52f69fec62..d2bc135902 100644 --- a/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb +++ b/recipes/kexec/kexec-tools-klibc-static_2.0.1.bb @@ -1,7 +1,7 @@ # the binaries are statical linked against klibc require kexec-tools2.inc -DEFAULT_PREFERENCE = "1" +DEFAULT_PREFERENCE = "-1" PR = "r0" DEPENDS = "klibc" -- cgit v1.2.3 From a22f66e2c362343922900d0d5443d423a028d267 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Fri, 25 Sep 2009 00:58:40 +0200 Subject: kexec-tools_2.0.1: arm seems unstable. WIP. Lower default pref. --- recipes/kexec/kexec-tools_2.0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/kexec/kexec-tools_2.0.1.bb b/recipes/kexec/kexec-tools_2.0.1.bb index 8285b20133..7692081d24 100644 --- a/recipes/kexec/kexec-tools_2.0.1.bb +++ b/recipes/kexec/kexec-tools_2.0.1.bb @@ -4,4 +4,4 @@ EXTRA_OECONF = " --with-zlib=yes" PR = "r0" -DEFAULT_PREFERENCE = "1" +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From de00ea5152804f562b47bd9171375eb64519c49d Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Thu, 24 Sep 2009 23:54:31 +0000 Subject: linux-palmpre: Add kernel recipe for the Palm Pre. We use a standard 2.6.24 as base and apply the palm patch on top of it. That should give us the identical kernel. (hope dies last) :) The output still needs to be tested on a real device. --- conf/checksums.ini | 4 ++++ recipes/linux/linux-palmpre_2.6.24.bb | 15 +++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 recipes/linux/linux-palmpre_2.6.24.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index ac0f85e222..ba831306f4 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -16074,6 +16074,10 @@ sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb md5=f0e143ed696bb064804cf0970718b414 sha256=7aad0d9df138fa99332a82ca69eb07504b04e9b0a3cdb405ce872ca3bd4f44ac +[http://palm.cdnetworks.net/opensource/1.1.0/linux-2.6.24-patch.gz] +md5=1c5547aa497a7eae9fa52ed4df4b0f11 +sha256=5f7c232f9216ce45f0ab0045098cd2b21b6f2f8a7668bffd2e06040a5b87ba84 + [http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.3.atmel.3.tar.bz2] md5=952715cc523f4a77e7c5f94f608594c0 sha256=d26a1de101692958fbca1d1be40fe52bd605636baea616a3e8ed96e422a3648d diff --git a/recipes/linux/linux-palmpre_2.6.24.bb b/recipes/linux/linux-palmpre_2.6.24.bb new file mode 100644 index 0000000000..9d5bc20a41 --- /dev/null +++ b/recipes/linux/linux-palmpre_2.6.24.bb @@ -0,0 +1,15 @@ +require linux.inc + +DESCRIPTION = "Linux kernel for Palm Pre. Original version of Palm, Inc." +KERNEL_IMAGETYPE = "uImage" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ + http://palm.cdnetworks.net/opensource/1.1.0/linux-2.6.24-patch.gz;patch=1 \ + " + +S = "${WORKDIR}/linux-2.6.24" + +# We try to build the identical kernel as Palms here, use their defconfig. +do_configure_prepend() { + install -m 0644 ${S}/arch/arm/configs/omap_sirloin_3430_defconfig ${WORKDIR}/defconfig +} -- cgit v1.2.3 From 0014b9be4e9c0e53be89ff2e799d706ff963213e Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 25 Sep 2009 00:15:44 +0000 Subject: palmpre.conf: Add recipe for the Palm Pre handset. Based on beagleboard.conf for omap3 and other for machine features and display properties. --- conf/machine/palmpre.conf | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 conf/machine/palmpre.conf diff --git a/conf/machine/palmpre.conf b/conf/machine/palmpre.conf new file mode 100644 index 0000000000..fe3c2794ee --- /dev/null +++ b/conf/machine/palmpre.conf @@ -0,0 +1,31 @@ +#@TYPE: Machine +#@NAME: Palm Pre machine +#@DESCRIPTION: Machine configuration for the Palm Pre handset +TARGET_ARCH = "arm" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +XSERVER = "xserver-xorg \ + xf86-input-evdev \ + xf86-input-mouse \ + xf86-video-omapfb \ + xf86-input-keyboard" + +MACHINE_DISPLAY_WIDTH_PIXELS = "320" +MACHINE_DISPLAY_HEIGHT_PIXELS = "480" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "185" + +require conf/machine/include/omap3.inc + +# Put it below omap3.inc as we override the kernel here +PREFERRED_PROVIDER_virtual/kernel = "linux-palmpre" + + +IMAGE_FSTYPES += "tar.bz2" + +# Let's keep the following three from the beagleboard machine config +UBOOT_MACHINE = "omap3_beagle_config" +PREFERRED_VERSION_u-boot = "git" +MACHINE_EXTRA_RRECOMMENDS = " omap3-sgx-modules " + +MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa phone bluetooth touchscreen keyboard wifi" -- cgit v1.2.3