[oe-commits] org.oe.dev arm-kernel-shim: Updated to version 1.5

[rwhitby commit]

arm-kernel-shim: Updated to version 1.5

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: e659ef8a467ef4136ee034a6696e2fa7f0bc2ad8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e659ef8a467ef4136ee034a6696e2fa7f0bc2ad8
Files:
1
packages/arm-kernel-shim/arm-kernel-shim_1.3.bb
packages/arm-kernel-shim/files/cmdline_if_none.patch
packages/arm-kernel-shim/files/passthrough-atags.patch
packages/arm-kernel-shim/arm-kernel-shim_1.4.bb
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/arm-kernel-shim/files/config-dsmg600.h
packages/arm-kernel-shim/files/config-fsg3.h
packages/arm-kernel-shim/files/config-nas100d.h
packages/arm-kernel-shim/files/config-nslu2.h
Diffs:

#
# mt diff -rb8e51a5662189786615d895cb3b5ace08eef2bc9 -re659ef8a467ef4136ee034a6696e2fa7f0bc2ad8
#
# 
# 
# delete "packages/arm-kernel-shim/arm-kernel-shim_1.3.bb"
# 
# delete "packages/arm-kernel-shim/files/cmdline_if_none.patch"
# 
# delete "packages/arm-kernel-shim/files/passthrough-atags.patch"
# 
# rename "packages/arm-kernel-shim/arm-kernel-shim_1.4.bb"
#     to "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
# 
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
#  from [579943879fc2bde18f436a97bcc6eceaef7e8bb0]
#    to [03183c3151029ae4353feb0d5f2cafdbc9bfbe49]
# 
# patch "packages/arm-kernel-shim/files/config-dsmg600.h"
#  from [37ba1efa5ef33feabbffa4e4f613f520aaa1f230]
#    to [d00909cd9a1463bc0408385eccc82a7aabbdb7f4]
# 
# patch "packages/arm-kernel-shim/files/config-fsg3.h"
#  from [cf13549daefc67ce00ab2a9b1280d2363849d1e7]
#    to [6420555a5dfd7edfd3e08a847c058eb380b637df]
# 
# patch "packages/arm-kernel-shim/files/config-nas100d.h"
#  from [4a38443d07d9779c75450d24c3544a9bc227a380]
#    to [8d1140eed7e81c795daca428e815df3fb362a185]
# 
# patch "packages/arm-kernel-shim/files/config-nslu2.h"
#  from [a3d80ce8cc2a2ecab785a7587305096f1ce59997]
#    to [0d2c6e91296e73d94373fbcd1b1e4fb41f45fc54]
# 
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.4.bb	579943879fc2bde18f436a97bcc6eceaef7e8bb0
+++ packages/arm-kernel-shim/arm-kernel-shim_1.5.bb	03183c3151029ae4353feb0d5f2cafdbc9bfbe49
@@ -1,21 +1,19 @@ LICENSE = "GPL"
 DESCRIPTION = "ARM Kernel Shim"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r3"
+# PR = "r1"
 
 COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
 
 SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \
-	   file://passthrough-atags.patch;patch=1 \
-	   file://cmdline_if_none.patch;patch=1 \
 	   file://config-nslu2.h \
 	   file://config-nas100d.h \
 	   file://config-dsmg600.h \
 	   file://config-fsg3.h"
 
-S = ${WORKDIR}/arm-kernel-shim-${PV}/1.3
+S = ${WORKDIR}/arm-kernel-shim-${PV}
 
 CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}"
 
============================================================
--- packages/arm-kernel-shim/files/config-dsmg600.h	37ba1efa5ef33feabbffa4e4f613f520aaa1f230
+++ packages/arm-kernel-shim/files/config-dsmg600.h	d00909cd9a1463bc0408385eccc82a7aabbdb7f4
@@ -18,12 +18,6 @@
 
 #define MACH_TYPE		   964
 
-/* The DSM-G600 RedBoot sets up the ATAGs correctly */
-#define PASSTHROUGH_ATAGS
-
-/* but if the command line passed in is empty, use the default. */
-#define CMDLINE_IF_NONE
-
 /* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
============================================================
--- packages/arm-kernel-shim/files/config-fsg3.h	cf13549daefc67ce00ab2a9b1280d2363849d1e7
+++ packages/arm-kernel-shim/files/config-fsg3.h	6420555a5dfd7edfd3e08a847c058eb380b637df
@@ -21,6 +21,8 @@
 
 #define MACH_TYPE		   1091
 
+#define CREATE_ATAGS
+
 /* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
============================================================
--- packages/arm-kernel-shim/files/config-nas100d.h	4a38443d07d9779c75450d24c3544a9bc227a380
+++ packages/arm-kernel-shim/files/config-nas100d.h	8d1140eed7e81c795daca428e815df3fb362a185
@@ -21,6 +21,10 @@
 
 #define MACH_TYPE		   865
 
+#define CREATE_ATAGS
+
+#define GUARANTEE_ATAG_CMDLINE
+
 /* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN
============================================================
--- packages/arm-kernel-shim/files/config-nslu2.h	a3d80ce8cc2a2ecab785a7587305096f1ce59997
+++ packages/arm-kernel-shim/files/config-nslu2.h	0d2c6e91296e73d94373fbcd1b1e4fb41f45fc54
@@ -21,6 +21,10 @@
 
 #define MACH_TYPE		   597
 
+#define CREATE_ATAGS
+
+#define GUARANTEE_ATAG_CMDLINE
+
 /* Uncomment one of these to switch the CPU into a specific mode. */
 //#define FORCE_LITTLEENDIAN
 //#define FORCE_BIGENDIAN