diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-12-14 11:33:28 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2009-12-14 11:36:05 +0100 |
| commit | e9edbb72aa1e17ab9aca8edd604d30229c45227e (patch) | |
| tree | 1be992d7377ef60486cb68aa878e088a57bc3aeb | |
| parent | 5985071c92b5e1b47e17bb0b60476245ace23382 (diff) | |
linux 2.6.25: merge 2.6.25.20 into it (they are same version)
| -rw-r--r-- | recipes/linux/linux-2.6.25/ronetix-pm9261/defconfig (renamed from recipes/linux/linux-2.6.25.20/ronetix-pm9261/defconfig) | 0 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.25/ronetix-pm9263/defconfig (renamed from recipes/linux/linux-2.6.25.20/ronetix-pm9263/defconfig) | 0 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.25.20.bb | 33 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.25.bb | 16 |
4 files changed, 15 insertions, 34 deletions
diff --git a/recipes/linux/linux-2.6.25.20/ronetix-pm9261/defconfig b/recipes/linux/linux-2.6.25/ronetix-pm9261/defconfig index 77cb9fafe5..77cb9fafe5 100644 --- a/recipes/linux/linux-2.6.25.20/ronetix-pm9261/defconfig +++ b/recipes/linux/linux-2.6.25/ronetix-pm9261/defconfig diff --git a/recipes/linux/linux-2.6.25.20/ronetix-pm9263/defconfig b/recipes/linux/linux-2.6.25/ronetix-pm9263/defconfig index c7171cd4ae..c7171cd4ae 100644 --- a/recipes/linux/linux-2.6.25.20/ronetix-pm9263/defconfig +++ b/recipes/linux/linux-2.6.25/ronetix-pm9263/defconfig diff --git a/recipes/linux/linux_2.6.25.20.bb b/recipes/linux/linux_2.6.25.20.bb deleted file mode 100644 index 6440e0650b..0000000000 --- a/recipes/linux/linux_2.6.25.20.bb +++ /dev/null @@ -1,33 +0,0 @@ -########################################### -#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com> -# linux_2.6.25.20.bb -# recipe file for PM9261 and PM9263 -########################################### - -require linux.inc - -PR = "r2" - -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_ronetix-pm9263 = "1" -DEFAULT_PREFERENCE_ronetix-pm9261 = "1" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.25.20.bz2;patch=1 \ - file://defconfig" - -# WARNING: for following patched is required the proper entry in conf/checksums.ini - -SRC_URI_append_ronetix-pm9263 = " \ - http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1 \ - http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/linux-2.6.25.4-ronetix-08-11-02.2228.patch;patch=1 \ - http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch;patch=1 \ - " - -SRC_URI_append_ronetix-pm9261 = " \ - http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1 \ - http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/linux-2.6.25.4-ronetix-08-11-02.2228.patch;patch=1 \ - http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch;patch=1 \ - " - -S = "${WORKDIR}/linux-2.6.25/" diff --git a/recipes/linux/linux_2.6.25.bb b/recipes/linux/linux_2.6.25.bb index aff0fc7a00..a89374a652 100644 --- a/recipes/linux/linux_2.6.25.bb +++ b/recipes/linux/linux_2.6.25.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r7" +PR = "r8" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" @@ -13,6 +13,8 @@ DEFAULT_PREFERENCE_alix = "1" DEFAULT_PREFERENCE_at32stk1000 = "1" DEFAULT_PREFERENCE_at91-l9260 = "1" DEFAULT_PREFERENCE_m8050 = "1" +DEFAULT_PREFERENCE_ronetix-pm9263 = "1" +DEFAULT_PREFERENCE_ronetix-pm9261 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.20.bz2;patch=1 \ @@ -42,6 +44,18 @@ SRC_URI_append_at91-l9260 = " \ http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1 \ " +SRC_URI_append_ronetix-pm9263 = " \ + http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1 \ + http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/linux-2.6.25.4-ronetix-08-11-02.2228.patch;patch=1 \ + http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch;patch=1 \ +" + +SRC_URI_append_ronetix-pm9261 = " \ + http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1 \ + http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/linux-2.6.25.4-ronetix-08-11-02.2228.patch;patch=1 \ + http://download.ronetix.info/sk-eb926x/linux/kernel/2.6.25.4/socketcan-driver-at91.patch;patch=1 \ +" + SRC_URI_append_m8050 = " file://m8050.diff;patch=1 file://update-mach-types.diff;patch=1" CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 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" |