git.openpandora.org / openembedded.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1a60e2a)
linux-orion: Fixup to work with linux.inc do_compile_append - the devio patches did...
authorTim 'timtim' Ellis <tim.ellis@foonas.org>
Sun, 18 Jan 2009 23:18:54 +0000 (23:18 +0000)
committerTim 'timtim' Ellis <tim.ellis@foonas.org>
Sun, 18 Jan 2009 23:18:54 +0000 (23:18 +0000)
packages/linux/linux-orion/dns323.patch patch | blob | history
packages/linux/linux-orion/kuropro.patch patch | blob | history
packages/linux/linux-orion/lspro.patch patch | blob | history
packages/linux/linux-orion/mv2120.patch patch | blob | history
packages/linux/linux-orion/ts109-ts209.patch [deleted file] patch | blob | history
packages/linux/linux-orion/ts409.patch patch | blob | history
packages/linux/linux-orion/tsx09.patch [new file with mode: 0644] patch | blob
packages/linux/linux-orion_2.6.27.10.bb patch | blob | history

diff --git a/packages/linux/linux-orion/dns323.patch b/packages/linux/linux-orion/dns323.patch
index 1816a62..e096209 100644 (file)
--- a/packages/linux/linux-orion/dns323.patch
+++ b/packages/linux/linux-orion/dns323.patch
@@ -1,15 +1,20 @@
-diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
-index 25f1230..789190e 100644
---- a/arch/arm/boot/Makefile
-+++ b/arch/arm/boot/Makefile
-@@ -55,6 +55,10 @@ $(obj)/compressed/vmlinux: $(obj)/Image FORCE
- 
- $(obj)/zImage:        $(obj)/compressed/vmlinux FORCE
-       $(call if_changed,objcopy)
-+      devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811006,4'
-+      cat foo $(obj)/zImage > zImage.new
-+      mv zImage.new $(obj)/zImage
-+      rm foo
-       @echo '  Kernel: $@ is ready'
- 
- endif
+diff -urN linux-2.6.27.10.old//arch/arm/tools/mach-types linux-2.6.27.10//arch/arm/tools/mach-types
+--- linux-2.6.27.10.old//arch/arm/tools/mach-types     2008-12-18 17:13:59.000000000 +0000
++++ linux-2.6.27.10//arch/arm/tools/mach-types 2009-01-18 22:55:14.757938089 +0000
+@@ -539,7 +539,6 @@
+ tidsc25                       MACH_TIDSC25            TIDSC25                 523
+ akcpmxl                       MACH_AKCPMXL            AKCPMXL                 524
+ av3xx                 MACH_AV3XX              AV3XX                   525
+-avila                 MACH_AVILA              AVILA                   526
+ pxa_mpm10             MACH_PXA_MPM10          PXA_MPM10               527
+ pxa_kyanite           MACH_PXA_KYANITE        PXA_KYANITE             528
+ sgold                 MACH_SGOLD              SGOLD                   529
+@@ -1535,7 +1534,7 @@
+ tmxipx425             MACH_TMXIPX425          TMXIPX425               1539
+ leep                  MACH_LEEP               LEEP                    1540
+ raad                  MACH_RAAD               RAAD                    1541
+-dns323                        MACH_DNS323             DNS323                  1542
++dns323                        MACH_DNS323             DNS323                  526
+ ap1000                        MACH_AP1000             AP1000                  1543
+ a9sam6432             MACH_A9SAM6432          A9SAM6432               1544
+ shiny                 MACH_SHINY              SHINY                   1545
diff --git a/packages/linux/linux-orion/kuropro.patch b/packages/linux/linux-orion/kuropro.patch
index a38e24f..c8a8fdc 100644 (file)
--- a/packages/linux/linux-orion/kuropro.patch
+++ b/packages/linux/linux-orion/kuropro.patch
@@ -1,15 +1,20 @@
-diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
-index 25f1230..789190e 100644
---- a/arch/arm/boot/Makefile
-+++ b/arch/arm/boot/Makefile
-@@ -55,6 +55,10 @@ $(obj)/compressed/vmlinux: $(obj)/Image FORCE
- 
- $(obj)/zImage:        $(obj)/compressed/vmlinux FORCE
-       $(call if_changed,objcopy)
-+      devio > foo 'wl 0xe3a01c05,4' 'wl 0xe38110e5,4'
-+      cat foo $(obj)/zImage > zImage.new
-+      mv zImage.new $(obj)/zImage
-+      rm foo
-       @echo '  Kernel: $@ is ready'
- 
- endif
+diff -urN linux-2.6.27.10.old//arch/arm/tools/mach-types linux-2.6.27.10//arch/arm/tools/mach-types
+--- linux-2.6.27.10.old//arch/arm/tools/mach-types     2008-12-18 17:13:59.000000000 +0000
++++ linux-2.6.27.10//arch/arm/tools/mach-types 2009-01-18 22:14:20.269277327 +0000
+@@ -539,7 +539,6 @@
+ tidsc25                       MACH_TIDSC25            TIDSC25                 523
+ akcpmxl                       MACH_AKCPMXL            AKCPMXL                 524
+ av3xx                 MACH_AV3XX              AV3XX                   525
+-avila                 MACH_AVILA              AVILA                   526
+ pxa_mpm10             MACH_PXA_MPM10          PXA_MPM10               527
+ pxa_kyanite           MACH_PXA_KYANITE        PXA_KYANITE             528
+ sgold                 MACH_SGOLD              SGOLD                   529
+@@ -1503,7 +1502,7 @@
+ apple_iphone          MACH_APPLE_IPHONE       APPLE_IPHONE            1506
+ yl9200                        MACH_YL9200             YL9200                  1507
+ rd88f5182             MACH_RD88F5182          RD88F5182               1508
+-kurobox_pro           MACH_KUROBOX_PRO        KUROBOX_PRO             1509
++kurobox_pro           MACH_KUROBOX_PRO        KUROBOX_PRO             526
+ se_poet                       MACH_SE_POET            SE_POET                 1510
+ mx31_3ds              MACH_MX31_3DS           MX31_3DS                1511
+ r270                  MACH_R270               R270                    1512
diff --git a/packages/linux/linux-orion/lspro.patch b/packages/linux/linux-orion/lspro.patch
index 0b1e83d..9e2b860 100644 (file)
--- a/packages/linux/linux-orion/lspro.patch
+++ b/packages/linux/linux-orion/lspro.patch
@@ -1,15 +1,20 @@
-diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
-index 25f1230..789190e 100644
---- a/arch/arm/boot/Makefile
-+++ b/arch/arm/boot/Makefile
-@@ -55,6 +55,10 @@ $(obj)/compressed/vmlinux: $(obj)/Image FORCE
- 
- $(obj)/zImage:        $(obj)/compressed/vmlinux FORCE
-       $(call if_changed,objcopy)
-+      devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811031,4'
-+      cat foo $(obj)/zImage > zImage.new
-+      mv zImage.new $(obj)/zImage
-+      rm foo
-       @echo '  Kernel: $@ is ready'
- 
- endif
+diff -urN linux-2.6.27.10.old//arch/arm/tools/mach-types linux-2.6.27.10//arch/arm/tools/mach-types
+--- linux-2.6.27.10.old//arch/arm/tools/mach-types     2008-12-18 17:13:59.000000000 +0000
++++ linux-2.6.27.10//arch/arm/tools/mach-types 2009-01-18 22:50:39.081913077 +0000
+@@ -539,7 +539,6 @@
+ tidsc25                       MACH_TIDSC25            TIDSC25                 523
+ akcpmxl                       MACH_AKCPMXL            AKCPMXL                 524
+ av3xx                 MACH_AV3XX              AV3XX                   525
+-avila                 MACH_AVILA              AVILA                   526
+ pxa_mpm10             MACH_PXA_MPM10          PXA_MPM10               527
+ pxa_kyanite           MACH_PXA_KYANITE        PXA_KYANITE             528
+ sgold                 MACH_SGOLD              SGOLD                   529
+@@ -1578,7 +1577,7 @@
+ tt9200                        MACH_TT9200             TT9200                  1582
+ digi2410              MACH_DIGI2410           DIGI2410                1583
+ terastation_pro2      MACH_TERASTATION_PRO2   TERASTATION_PRO2        1584
+-linkstation_pro               MACH_LINKSTATION_PRO    LINKSTATION_PRO         1585
++linkstation_pro               MACH_LINKSTATION_PRO    LINKSTATION_PRO         526
+ motorola_a780         MACH_MOTOROLA_A780      MOTOROLA_A780           1587
+ motorola_e6           MACH_MOTOROLA_E6        MOTOROLA_E6             1588
+ motorola_e2           MACH_MOTOROLA_E2        MOTOROLA_E2             1589
diff --git a/packages/linux/linux-orion/mv2120.patch b/packages/linux/linux-orion/mv2120.patch
index 2a07f75..a678c99 100644 (file)
--- a/packages/linux/linux-orion/mv2120.patch
+++ b/packages/linux/linux-orion/mv2120.patch
@@ -1,24 +1,20 @@
-diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
-index da226ab..cd49d65 100644
---- a/arch/arm/boot/Makefile
-+++ b/arch/arm/boot/Makefile
-@@ -55,6 +55,10 @@ $(obj)/compressed/vmlinux: $(obj)/Image FORCE
- 
- $(obj)/zImage:        $(obj)/compressed/vmlinux FORCE
-       $(call if_changed,objcopy)
-+      devio > foo 'wl 0xe3a01c06,4' 'wl 0xe381109d,4'
-+      cat foo $(obj)/zImage > zImage.new
-+      mv zImage.new $(obj)/zImage
-+      rm foo
-       @echo '  Kernel: $@ is ready'
- 
- endif
-@@ -67,7 +71,7 @@ quiet_cmd_uimage = UIMAGE  $@
- ifeq ($(CONFIG_ZBOOT_ROM),y)
- $(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
- else
--$(obj)/uImage: LOADADDR=$(ZRELADDR)
-+$(obj)/uImage: LOADADDR=0x02000000
- endif
- 
- $(obj)/uImage:        $(obj)/zImage FORCE
+diff -urN linux-2.6.27.10.old//arch/arm/tools/mach-types linux-2.6.27.10//arch/arm/tools/mach-types
+--- linux-2.6.27.10.old//arch/arm/tools/mach-types     2008-12-18 17:13:59.000000000 +0000
++++ linux-2.6.27.10//arch/arm/tools/mach-types 2009-01-18 22:53:55.124000375 +0000
+@@ -539,7 +539,6 @@
+ tidsc25                       MACH_TIDSC25            TIDSC25                 523
+ akcpmxl                       MACH_AKCPMXL            AKCPMXL                 524
+ av3xx                 MACH_AV3XX              AV3XX                   525
+-avila                 MACH_AVILA              AVILA                   526
+ pxa_mpm10             MACH_PXA_MPM10          PXA_MPM10               527
+ pxa_kyanite           MACH_PXA_KYANITE        PXA_KYANITE             528
+ sgold                 MACH_SGOLD              SGOLD                   529
+@@ -1682,7 +1681,7 @@
+ wbd111                        MACH_WBD111             WBD111                  1690
+ elaracpe              MACH_ELARACPE           ELARACPE                1691
+ mabv3                 MACH_MABV3              MABV3                   1692
+-mv2120                        MACH_MV2120             MV2120                  1693
++mv2120                        MACH_MV2120             MV2120                  526
+ csb737                        MACH_CSB737             CSB737                  1695
+ mx51_3ds              MACH_MX51_3DS           MX51_3DS                1696
+ g900                  MACH_G900               G900                    1697
diff --git a/packages/linux/linux-orion/ts109-ts209.patch b/packages/linux/linux-orion/ts109-ts209.patch
deleted file mode 100644 (file)
index 7dd33ef..0000000
--- a/packages/linux/linux-orion/ts109-ts209.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
-index 25f1230..789190e 100644
---- a/arch/arm/boot/Makefile
-+++ b/arch/arm/boot/Makefile
-@@ -55,6 +55,10 @@ $(obj)/compressed/vmlinux: $(obj)/Image FORCE
- 
- $(obj)/zImage:        $(obj)/compressed/vmlinux FORCE
-       $(call if_changed,objcopy)
-+      devio > foo 'wl 0xe3a01c06,4' 'wl 0xe381101d,4'
-+      cat foo $(obj)/zImage > zImage.new
-+      mv zImage.new $(obj)/zImage
-+      rm foo
-       @echo '  Kernel: $@ is ready'
- 
- endif
diff --git a/packages/linux/linux-orion/ts409.patch b/packages/linux/linux-orion/ts409.patch
index 52cedcc..b69e706 100644 (file)
--- a/packages/linux/linux-orion/ts409.patch
+++ b/packages/linux/linux-orion/ts409.patch
@@ -1,15 +1,20 @@
-diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
-index 25f1230..789190e 100644
---- a/arch/arm/boot/Makefile
-+++ b/arch/arm/boot/Makefile
-@@ -55,6 +55,10 @@ $(obj)/compressed/vmlinux: $(obj)/Image FORCE
- 
- $(obj)/zImage:        $(obj)/compressed/vmlinux FORCE
-       $(call if_changed,objcopy)
-+      devio > foo 'wl 0xe3a01c06,4' 'wl 0xe3811041,4'
-+      cat foo $(obj)/zImage > zImage.new
-+      mv zImage.new $(obj)/zImage
-+      rm foo
-       @echo '  Kernel: $@ is ready'
- 
- endif
+diff -urN linux-2.6.27.10.old//arch/arm/tools/mach-types linux-2.6.27.10//arch/arm/tools/mach-types
+--- linux-2.6.27.10.old//arch/arm/tools/mach-types     2008-12-18 17:13:59.000000000 +0000
++++ linux-2.6.27.10//arch/arm/tools/mach-types 2009-01-18 22:49:34.032000351 +0000
+@@ -539,7 +539,6 @@
+ tidsc25                       MACH_TIDSC25            TIDSC25                 523
+ akcpmxl                       MACH_AKCPMXL            AKCPMXL                 524
+ av3xx                 MACH_AV3XX              AV3XX                   525
+-avila                 MACH_AVILA              AVILA                   526
+ pxa_mpm10             MACH_PXA_MPM10          PXA_MPM10               527
+ pxa_kyanite           MACH_PXA_KYANITE        PXA_KYANITE             528
+ sgold                 MACH_SGOLD              SGOLD                   529
+@@ -1593,7 +1592,7 @@
+ cartesio              MACH_CARTESIO           CARTESIO                1598
+ toybox                        MACH_TOYBOX             TOYBOX                  1599
+ tx27                  MACH_TX27               TX27                    1600
+-ts409                 MACH_TS409              TS409                   1601
++ts409                 MACH_TS409              TS409                   526
+ p300                  MACH_P300               P300                    1602
+ xdacomet              MACH_XDACOMET           XDACOMET                1603
+ dexflex2              MACH_DEXFLEX2           DEXFLEX2                1604
diff --git a/packages/linux/linux-orion/tsx09.patch b/packages/linux/linux-orion/tsx09.patch
new file mode 100644 (file)
index 0000000..5c6d935
--- /dev/null
+++ b/packages/linux/linux-orion/tsx09.patch
@@ -0,0 +1,20 @@
+diff -urN linux-2.6.27.10.old//arch/arm/tools/mach-types linux-2.6.27.10//arch/arm/tools/mach-types
+--- linux-2.6.27.10.old//arch/arm/tools/mach-types     2008-12-18 17:13:59.000000000 +0000
++++ linux-2.6.27.10//arch/arm/tools/mach-types 2009-01-18 22:45:14.777942860 +0000
+@@ -539,7 +539,6 @@
+ tidsc25                       MACH_TIDSC25            TIDSC25                 523
+ akcpmxl                       MACH_AKCPMXL            AKCPMXL                 524
+ av3xx                 MACH_AV3XX              AV3XX                   525
+-avila                 MACH_AVILA              AVILA                   526
+ pxa_mpm10             MACH_PXA_MPM10          PXA_MPM10               527
+ pxa_kyanite           MACH_PXA_KYANITE        PXA_KYANITE             528
+ sgold                 MACH_SGOLD              SGOLD                   529
+@@ -1558,7 +1557,7 @@
+ davinci_ldk           MACH_DAVINCI_LDK        DAVINCI_LDK             1562
+ phreedom              MACH_PHREEDOM           PHREEDOM                1563
+ sg310                 MACH_SG310              SG310                   1564
+-ts_x09                        MACH_TS209              TS209                   1565
++ts_x09                        MACH_TS209              TS209                   526
+ at91cap9adk           MACH_AT91CAP9ADK        AT91CAP9ADK             1566
+ tion9315              MACH_TION9315           TION9315                1567
+ mast                  MACH_MAST               MAST                    1568
diff --git a/packages/linux/linux-orion_2.6.27.10.bb b/packages/linux/linux-orion_2.6.27.10.bb
index fa931ea..2e7afe3 100644 (file)
--- a/packages/linux/linux-orion_2.6.27.10.bb
+++ b/packages/linux/linux-orion_2.6.27.10.bb
@@ -1,8 +1,7 @@
 DESCRIPTION = "Linux Kernel for Marvell Orion based devices"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r3"
-DEPENDS = "devio-native"
+PR = "r4"
 COMPATIBLE_MACHINE = "(dns323|mv2120|kuropro|lspro|tsx09|ts409)"
 
 require linux.inc
@@ -16,13 +15,12 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 \
 
 S = "${WORKDIR}/linux-2.6.27"
 
-# Fix the mach-type of orion devices
+# Fix the mach-type of orion devices - always passed 526
 SRC_URI_append_dns323 +=        "file://dns323.patch;patch=1"
 SRC_URI_append_mv2120 +=        "file://mv2120.patch;patch=1"
 SRC_URI_append_kuropro +=       "file://kuropro.patch;patch=1"
 SRC_URI_append_lspro +=         "file://lspro.patch;patch=1"
-SRC_URI_append_tsx09 +=         "file://ts109-ts209.patch;patch=1"
+SRC_URI_append_tsx09 +=         "file://tsx09.patch;patch=1"
 SRC_URI_append_ts409 +=         "file://ts409.patch;patch=1"
 
 KERNEL_IMAGETYPE ?= "uImage"
-
Clone of mainline OpenEmbedded repository