summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/.mtn2git_empty (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/.mtn2git_empty)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/add-elpp-stuff.patch (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/add-elpp-stuff.patch)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/add-oz-release-string.patch (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/add-oz-release-string.patch)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/connectplus-remove-ide-HACK.patch (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/connectplus-remove-ide-HACK.patch)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/defconfig-c7x0 (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-c7x0)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-collie)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/defconfig-cxx00 (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00)1
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/defconfig-ipaq-pxa270 (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-ipaq-pxa270)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/defconfig-poodle (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-poodle)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/defconfig-tosa (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-tosa)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/dtl1_cs-add-socket-revE.patch (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/dtl1_cs-add-socket-revE.patch)0
-rw-r--r--packages/linux/linux-openzaurus-2.6.14-git3/pxa-serial-hack.patch (renamed from packages/linux/linux-openzaurus-2.6.14-rc4/pxa-serial-hack.patch)0
-rw-r--r--packages/linux/linux-openzaurus.inc5
-rw-r--r--packages/linux/linux-openzaurus_2.6.14-git3.bb (renamed from packages/linux/linux-openzaurus_2.6.14-rc4.bb)46
14 files changed, 27 insertions, 25 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/.mtn2git_empty b/packages/linux/linux-openzaurus-2.6.14-git3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/.mtn2git_empty
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/.mtn2git_empty
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/add-elpp-stuff.patch b/packages/linux/linux-openzaurus-2.6.14-git3/add-elpp-stuff.patch
index 04ab185f4f..04ab185f4f 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/add-elpp-stuff.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/add-elpp-stuff.patch
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/add-oz-release-string.patch b/packages/linux/linux-openzaurus-2.6.14-git3/add-oz-release-string.patch
index 22a6fd3943..22a6fd3943 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/add-oz-release-string.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/add-oz-release-string.patch
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/connectplus-remove-ide-HACK.patch b/packages/linux/linux-openzaurus-2.6.14-git3/connectplus-remove-ide-HACK.patch
index 4414b21191..4414b21191 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/connectplus-remove-ide-HACK.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/connectplus-remove-ide-HACK.patch
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-c7x0
index 3e6df05f20..3e6df05f20 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-c7x0
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-collie b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie
index 9f51b61169..9f51b61169 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-collie
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-collie
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-cxx00
index d6444b4058..bae7042808 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-cxx00
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-cxx00
@@ -990,6 +990,7 @@ CONFIG_FB_PXA=y
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
CONFIG_FONT_8x16=y
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-ipaq-pxa270 b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-ipaq-pxa270
index 8b41380784..8b41380784 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-ipaq-pxa270
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-ipaq-pxa270
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-poodle b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-poodle
index a0810f8381..a0810f8381 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-poodle
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-poodle
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-tosa
index dd1e70fa03..dd1e70fa03 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/defconfig-tosa
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.14-git3/dtl1_cs-add-socket-revE.patch
index 9fe3bd06d3..9fe3bd06d3 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/dtl1_cs-add-socket-revE.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/dtl1_cs-add-socket-revE.patch
diff --git a/packages/linux/linux-openzaurus-2.6.14-rc4/pxa-serial-hack.patch b/packages/linux/linux-openzaurus-2.6.14-git3/pxa-serial-hack.patch
index 7892a0f929..7892a0f929 100644
--- a/packages/linux/linux-openzaurus-2.6.14-rc4/pxa-serial-hack.patch
+++ b/packages/linux/linux-openzaurus-2.6.14-git3/pxa-serial-hack.patch
diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index 907801a382..cb43f5aef1 100644
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -31,7 +31,10 @@ export mem = ${@bb.data.getVar("COLLIE_MEMORY_SIZE",d,1) or "32"}
export rd = ${@bb.data.getVar("COLLIE_RAMDISK_SIZE",d,1) or "32"}
CMDLINE_MEM_collie = "mem=${mem}M"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug"
+CMDLINE_ROTATE_spitz = "fbcon=rotate:1"
+CMDLINE_ROTATE_akita = "fbcon=rotate:1"
+CMDLINE_ROTATE_borzoi = "fbcon=rotate:1"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} ${CMDLINE_ROTATE} debug"
###############################################################
# Enable or disable ELPP via local.conf - default is "no"
diff --git a/packages/linux/linux-openzaurus_2.6.14-rc4.bb b/packages/linux/linux-openzaurus_2.6.14-git3.bb
index 5b96ba0091..653d5497ca 100644
--- a/packages/linux/linux-openzaurus_2.6.14-rc4.bb
+++ b/packages/linux/linux-openzaurus_2.6.14-git3.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r4"
+PR = "r0"
DEFAULT_PREFERENCE = "-1"
@@ -9,32 +9,26 @@ DEFAULT_PREFERENCE = "-1"
# http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.12-rc4-git1.bz2;patch=1 \
# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc1.bz2;patch=1 \
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
+# ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc4.bz2;patch=1 \
+# ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \
# Patches submitted upstream are towards top of this list
# Hacks should clearly named and at the bottom
-# ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.14-rc2/2.6.14-rc2-mm1/2.6.14-rc2-mm1.bz2;patch=1 \
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
- ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.14-rc4.bz2;patch=1 \
- ${RPSRC}/spitz_pxafb_cleanup-r1.patch;patch=1 \
- ${RPSRC}/pxafb_add_parent-r1.patch;patch=1 \
- ${RPSRC}/spitz_compilefix-r0.patch;patch=1 \
- ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.14.tar.gz \
+ http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.14-git3.bz2;patch=1 \
${RPSRC}/pxa_pmops_static-r1.patch;patch=1 \
- ${RPSRC}/pxa_i2c_fixes-r1.patch;patch=1 \
- ${RPSRC}/pxa_ohci_platform-r1.patch;patch=1 \
- ${RPSRC}/pxa_ohci_suspend-r0.patch;patch=1 \
+ ${RPSRC}/pxa_i2c_fixes-r3.patch;patch=1 \
+ ${RPSRC}/pxa_ohci_platform-r2.patch;patch=1 \
+ ${RPSRC}/pxa_ohci_suspend-r2.patch;patch=1 \
${RPSRC}/ide_not_removable-r0.patch;patch=1 \
- ${RPSRC}/sharpsl_pm-r9.patch;patch=1 \
+ ${RPSRC}/sharpsl_pm-r10.patch;patch=1 \
${RPSRC}/corgi_pm-r4.patch;patch=1 \
- ${RPSRC}/spitz_base_extras-r5.patch;patch=1 \
+ ${RPSRC}/spitz_base_extras-r7.patch;patch=1 \
${RPSRC}/spitz_pm-r5.patch;patch=1 \
- ${RPSRC}/spitz_cf-r4.patch;patch=1 \
+ ${RPSRC}/spitz_cf-r5.patch;patch=1 \
${RPSRC}/akita_mtd_fix-r0.patch;patch=1 \
${RPSRC}/max7310-r1.patch;patch=1 \
${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
- ${RPSRC}/pxa_irda-r5.patch;patch=1 \
- ${RPSRC}/corgi_irda-r3.patch;patch=1 \
- ${RPSRC}/poodle_irda-r0.patch;patch=1 \
${RPSRC}/pxa_rtc-r1.patch;patch=1 \
${RPSRC}/input_power-r2.patch;patch=1 \
${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
@@ -42,18 +36,22 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
${RPSRC}/corgi_snd-r11.patch;patch=1 \
${RPSRC}/export_scoop-r0.patch;patch=1 \
${RPSRC}/pxa25x_cpufreq-r0.patch;patch=1 \
- ${RPSRC}/ipaq/hx2750_base-r21.patch;patch=1 \
+ ${RPSRC}/fbdev/fbdev-r0.patch;patch=1 \
+ ${RPSRC}/fbdev/fbdev1-r0.patch;patch=1 \
+ ${RPSRC}/fbdev/fbdev2-r0.patch;patch=1 \
+ ${RPSRC}/fbdev/fbdev3-r0.patch;patch=1 \
+ ${RPSRC}/fbdev/con_rotate-r0.patch;patch=1 \
+ ${RPSRC}/fbdev/con_rotate1-r1.patch;patch=1 \
+ ${RPSRC}/ipaq/hx2750_base-r22.patch;patch=1 \
${RPSRC}/ipaq/hx2750_bl-r2.patch;patch=1 \
${RPSRC}/ipaq/hx2750_pcmcia-r1.patch;patch=1 \
${RPSRC}/ipaq/pxa_keys-r2.patch;patch=1 \
${RPSRC}/ipaq/tsc2101-r8.patch;patch=1 \
${RPSRC}/ipaq/hx2750_test1-r2.patch;patch=1 \
- ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
${DOSRC}/tc6393-device-r5.patch;patch=1 \
${DOSRC}/tc6393_nand-r6.patch;patch=1 \
${DOSRC}/tosa-machine-base-r12.patch;patch=1 \
${DOSRC}/tosa-keyboard-r6.patch;patch=1 \
- ${RPSRC}/temp/tc6393fb-r7.patch;patch=1 \
${DOSRC}/tosa-power-r6.patch;patch=1 \
${DOSRC}/tosa-mmc-r5.patch;patch=1 \
${DOSRC}/tosa-udc-r4.patch;patch=1 \
@@ -65,10 +63,8 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
${RPSRC}/alsa/alsa_soc-r3.patch;patch=1 \
${RPSRC}/alsa/alsa_soc-r3_1.patch;patch=1 \
- ${RPSRC}/alsa/ssp_pxa_regs-r0.patch;patch=1 \
- ${RPSRC}/wm8731-r5.patch;patch=1 \
+ ${RPSRC}/wm8731-r6.patch;patch=1 \
file://add-oz-release-string.patch;patch=1 \
- file://add-elpp-stuff.patch;patch=1 \
file://pxa-serial-hack.patch;patch=1 \
${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \
file://dtl1_cs-add-socket-revE.patch;patch=1 \
@@ -79,6 +75,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
file://defconfig-poodle \
file://defconfig-cxx00 \
file://defconfig-tosa "
+# file://add-elpp-stuff.patch;patch=1
# These patches would really help collie/poodle but we
# need someone to maintain them
@@ -91,10 +88,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
# ${JLSRC}/zaurus-leds-2.6.11.diff.gz;patch=1 \
SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \
+ ${RPSRC}/temp/tc6393fb-r7.patch;patch=1 \
${DOSRC}/pxa-ac97-suspend-r0.patch;patch=1 \
${DOSRC}/ac97codec-rename-revert-r0.patch;patch=1 \
${DOSRC}/wm9712-ts-r3.patch;patch=1 \
${DOSRC}/tosa-pxaac97-r4.patch;patch=1 \
${DOSRC}/tosa-bluetooth-r0.patch;patch=1 "
-S = "${WORKDIR}/linux-2.6.13"
+S = "${WORKDIR}/linux-2.6.14"