[oe-commits] org.oe.dev linux-turbostation: Update to 2.6.20.2, repartition, remove unneccessary patches
nail commit
openembedded-commits at lists.openembedded.org
Sun Mar 11 19:01:59 UTC 2007
linux-turbostation: Update to 2.6.20.2, repartition, remove unneccessary patches
Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: eee01f8cdbc71efc164d2cb22b3587142b08c9bb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=eee01f8cdbc71efc164d2cb22b3587142b08c9bb
Files:
1
packages/linux/linux-turbostation/2.6.20.1
packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c
packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig
packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile
packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c
packages/linux/linux-turbostation_2.6.20.1.bb
packages/linux/linux-turbostation_2.6.20.2.bb
packages/linux/linux-turbostation/defconfig
packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c
Diffs:
#
# mt diff -r34720880704c97e3f842319d2c02bd715ea2d6ad -reee01f8cdbc71efc164d2cb22b3587142b08c9bb
#
#
#
# delete "packages/linux/linux-turbostation/2.6.20.1"
#
# delete "packages/linux/linux-turbostation/linux-2.6.16_arch_ppc_syslib_open_pic.c"
#
# delete "packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Kconfig"
#
# delete "packages/linux/linux-turbostation/linux-2.6.16_drivers_i2c_chips_Makefile"
#
# delete "packages/linux/linux-turbostation/linux-2.6.16_drivers_net_r8169.c"
#
# rename "packages/linux/linux-turbostation_2.6.20.1.bb"
# to "packages/linux/linux-turbostation_2.6.20.2.bb"
#
# patch "packages/linux/linux-turbostation/defconfig"
# from [cadd7bedd6596442dcc09dd0b0cb71bf377c3f63]
# to [00db62daa7b9664fdc61dd33b39b125e5e3dc769]
#
# patch "packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c"
# from [e02e9b5c7ce26327a3cebf6b04a9b8d0a97337e2]
# to [04ca9bea7b4693de13d8eee0598ba7ea341565a8]
#
# patch "packages/linux/linux-turbostation_2.6.20.2.bb"
# from [b2617f037dbbfb156bfe692495f28bdec36ec4d5]
# to [b96efd8f4a67e72804a71f076b5374f53521e42c]
#
============================================================
--- packages/linux/linux-turbostation/defconfig cadd7bedd6596442dcc09dd0b0cb71bf377c3f63
+++ packages/linux/linux-turbostation/defconfig 00db62daa7b9664fdc61dd33b39b125e5e3dc769
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.20.1
-# Thu Mar 8 19:11:26 2007
+# Linux kernel version: 2.6.20.2
+# Sun Mar 11 15:29:33 2007
#
CONFIG_MMU=y
CONFIG_GENERIC_HARDIRQS=y
@@ -958,7 +958,6 @@ CONFIG_I2C_MPC=y
# CONFIG_SENSORS_PCF8591 is not set
# CONFIG_SENSORS_M41T00 is not set
# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_SENSORS_S35390A is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
============================================================
--- packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c e02e9b5c7ce26327a3cebf6b04a9b8d0a97337e2
+++ packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c 04ca9bea7b4693de13d8eee0598ba7ea341565a8
@@ -1,8 +1,8 @@
-Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c
+Index: linux-2.6.20.2/drivers/mtd/maps/physmap.c
===================================================================
---- linux-2.6.21-rc2-git3.orig/drivers/mtd/maps/physmap.c 2007-03-06 01:06:56.000000000 +0100
-+++ linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c 2007-03-06 01:12:35.000000000 +0100
-@@ -134,13 +134,43 @@
+--- linux-2.6.20.2.orig/drivers/mtd/maps/physmap.c 2007-03-11 15:22:25.000000000 +0100
++++ linux-2.6.20.2/drivers/mtd/maps/physmap.c 2007-03-11 15:28:18.000000000 +0100
+@@ -134,13 +134,53 @@
}
info->mtd->owner = THIS_MODULE;
@@ -11,27 +11,37 @@ Index: linux-2.6.21-rc2-git3/drivers/mtd
+ .name = "u-boot",
+ .offset = 0x00F00000,
+ .size = 0x00040000,
-+ .mask_flags = MTD_WRITEABLE, /* force read-only */
++ .mask_flags = MTD_WRITEABLE,
+ },
+ {
-+ .name = "kernel", /* default kernel image */
++ .name = "kernel",
+ .offset = 0x00000000,
-+ .size = 0x00280000,
++ .size = 0x00200000,
+ },
+ {
+ .name = "rootfs",
-+ .offset = 0x00280000,
-+ .size = 0x00C80000,
++ .offset = 0x00200000,
++ .size = 0x00D00000,
+ },
+ {
-+ .name = "empty",
++ .name = "u-boot env",
+ .offset = 0x00F40000,
-+ .size = 0x000A0000,
++ .size = 0x00020000,
+ },
+ {
-+ .name = "u-boot env",
-+ .offset = 0x00FE0000,
++ .name = "u-boot2",
++ .offset = 0x00F60000,
++ .size = 0x00040000,
++ },
++ {
++ .name = "u-boot2 env",
++ .offset = 0x00FA0000,
+ .size = 0x00020000,
++ },
++ {
++ .name = "sysconf",
++ .offset = 0x00FC0000,
++ .size = 0x00040000,
+ }
+};
+
@@ -43,7 +53,7 @@ Index: linux-2.6.21-rc2-git3/drivers/mtd
return 0;
}
-
-+ physmap_set_partitions(TS101_partitions, 5);
++ physmap_set_partitions(TS101_partitions, 7);
if (physmap_data->nr_parts) {
printk(KERN_NOTICE "Using physmap partition information\n");
add_mtd_partitions(info->mtd, physmap_data->parts,
============================================================
--- packages/linux/linux-turbostation_2.6.20.1.bb b2617f037dbbfb156bfe692495f28bdec36ec4d5
+++ packages/linux/linux-turbostation_2.6.20.2.bb b96efd8f4a67e72804a71f076b5374f53521e42c
@@ -1,8 +1,8 @@ DEPENDS = "uboot-utils"
DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform"
SECTION = "kernel"
LICENSE = "GPL"
DEPENDS = "uboot-utils"
-PR = "r6"
+PR = "r1"
COMPATIBLE_MACHINE = "turbostation"
@@ -11,17 +11,13 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
file://001_r1000.diff;patch=1 \
file://linux-2.6.16_arch_ppc_platforms_sandpoint.h;patch=1 \
- file://linux-2.6.16_drivers_i2c_chips_Makefile;patch=1 \
file://002_qnap-pic.diff;patch=1 \
file://linux-2.6.16_arch_ppc_syslib_Makefile;patch=1 \
file://linux-2.6.16_drivers_mtd_maps_physmap.c;patch=1 \
file://linux-2.6.16_arch_ppc_syslib_mpc10x_common.c;patch=1 \
- file://linux-2.6.16_drivers_net_r8169.c;patch=1 \
file://linux-2.6.16_arch_ppc_platforms_Makefile;patch=1 \
- file://linux-2.6.16_arch_ppc_syslib_open_pic.c;patch=1 \
file://linux-2.6.16_include_asm-ppc_mpc10x.h;patch=1 \
file://linux-2.6.16_arch_ppc_platforms_sandpoint.c;patch=1 \
- file://linux-2.6.16_drivers_i2c_chips_Kconfig;patch=1 \
file://defconfig"
S = "${WORKDIR}/linux-${PV}"
More information about the Openembedded-commits
mailing list