diff options
| author | Holger Freyther <zecke@selfish.org> | 2007-03-07 00:43:45 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2007-03-07 00:43:45 +0000 |
| commit | ef577a4a45dc409f13b78925308dd25c646e92ce (patch) | |
| tree | f7f2e1d43040ce79799962b799c66d1045cc325b | |
| parent | deacf77e13e6f1f450d1f9e91a466c387c8494f0 (diff) | |
| parent | 4cc0ce6d895a1df9c46226d47041bc0130298b5b (diff) | |
merge of '39030d97b266cc74d362571046ff686f9fa4b71c'
and 'efc288dfca6db8af7c6c350c1661838d4c1433c8'
| -rw-r--r-- | conf/machine/turbostation.conf | 15 | ||||
| -rw-r--r-- | packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c | 42 | ||||
| -rw-r--r-- | packages/linux/linux-turbostation_2.6.20.1.bb | 2 |
3 files changed, 29 insertions, 30 deletions
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf index a4b19de740..7184958664 100644 --- a/conf/machine/turbostation.conf +++ b/conf/machine/turbostation.conf @@ -1,17 +1,26 @@ TARGET_ARCH = "powerpc" TARGET_OS = "linux" TARGET_FPU = "hard" -# TARGET_VENDOR = "oe" PACKAGE_EXTRA_ARCHS = "ppc ppc603e" +MACHINE_TASK_PROVIDER = "task-base" + # terminal specs - console, but no other ports SERIAL_CONSOLE="115200 console" USE_VT="0" MODUTILS=26 -MACHINE_TASK_PROVIDER = "task-base" MACHINE_FEATURES= "kernel26 usbhost" -BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation" + +# Do we need any kernel modules? +OPENPROTIUM_KERNEL = "" + +# We want udev support in the image udevdir = "/dev" +OPENPROTIUM_SUPPORT ?= "diffutils cpio findutils uboot-utils udev" +BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm" +ROOT_FLASH_SIZE = 12 +# Hardware stuff +ERASEBLOCK_SIZE = "0x20000" require conf/machine/include/tune-ppc603e.conf diff --git a/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c b/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c index 1e59cecc9d..b73b227220 100644 --- a/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c +++ b/packages/linux/linux-turbostation/linux-2.6.16_drivers_mtd_maps_physmap.c @@ -1,47 +1,37 @@ -Index: linux-2.6.20.1/drivers/mtd/maps/physmap.c +Index: linux-2.6.21-rc2-git3/drivers/mtd/maps/physmap.c =================================================================== ---- linux-2.6.20.1.orig/drivers/mtd/maps/physmap.c 2007-02-20 07:34:32.000000000 +0100 -+++ linux-2.6.20.1/drivers/mtd/maps/physmap.c 2007-02-26 02:05:28.000000000 +0100 -@@ -134,13 +134,53 @@ +--- 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 @@ } info->mtd->owner = THIS_MODULE; +static struct mtd_partition TS101_partitions[] = { + { -+ .name = "U-Boot", ++ .name = "u-boot", + .offset = 0x00F00000, + .size = 0x00040000, + .mask_flags = MTD_WRITEABLE, /* force read-only */ + }, + { -+ .name = "Kernel", /* default kernel image */ ++ .name = "kernel", /* default kernel image */ + .offset = 0x00000000, -+ .size = 0x00200000, ++ .size = 0x00280000, + }, + { -+ .name = "RootFS1", -+ .offset = 0x00200000, -+ .size = 0x00900000, ++ .name = "rootfs", ++ .offset = 0x00280000, ++ .size = 0x00C80000, + }, + { -+ .name = "RootFS2", -+ .offset = 0x00b00000, -+ .size = 0x00300000, -+ }, -+ { -+ .name = "Vendor", -+ .offset = 0x00E00000, -+ .size = 0x00100000, -+ }, -+ { -+ .name = "U-Boot Config", ++ .name = "empty", + .offset = 0x00F40000, -+ .size = 0x00020000, ++ .size = 0x000A0000, + }, + { -+ .name = "NAS Config", -+ .offset = 0x00F60000, -+ .size = 0x000A0000, ++ .name = "u-boot env", ++ .offset = 0x00FE0000, ++ .size = 0x00020000, + } +}; + @@ -53,7 +43,7 @@ Index: linux-2.6.20.1/drivers/mtd/maps/physmap.c return 0; } - -+ physmap_set_partitions(TS101_partitions, 7); ++ physmap_set_partitions(TS101_partitions, 5); if (physmap_data->nr_parts) { printk(KERN_NOTICE "Using physmap partition information\n"); add_mtd_partitions(info->mtd, physmap_data->parts, diff --git a/packages/linux/linux-turbostation_2.6.20.1.bb b/packages/linux/linux-turbostation_2.6.20.1.bb index 38b607e65b..6e08b9ecff 100644 --- a/packages/linux/linux-turbostation_2.6.20.1.bb +++ b/packages/linux/linux-turbostation_2.6.20.1.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for the QNAP TurboStation platform" SECTION = "kernel" LICENSE = "GPL" DEPENDS = "uboot-utils" -PR = "r3" +PR = "r4" # notes on iom def kernel: # |