[oe-commits] org.oe.dev arm-kernel-shim: Added PASSTHROUGH_ATAGS support.

[rwhitby commit]

arm-kernel-shim: Added PASSTHROUGH_ATAGS support.

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

#
# mt diff -r8c812873e7b7a0a3c5740076bbec3935db289a83 -rd125bf400582faeb1540478ae087da821b077b4a
#
# 
# 
# add_file "packages/arm-kernel-shim/files/passthrough-atags.patch"
#  content [13ce67916c07a8c0882ad9d5127dc1e54a21b770]
# 
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.3.bb"
#  from [f2125bdbb9b1ee2fe17ce293e4e0df55040ce537]
#    to [f76553f2032435dab3f62170824a3f9d82c6beaf]
# 
# patch "packages/arm-kernel-shim/files/config-dsmg600.h"
#  from [5d0a040bba86dbb05ec9fdeca1ce508c35b21ca4]
#    to [c81a661c49e1b83e23275cfce5a32e290fc013a8]
# 
============================================================
--- packages/arm-kernel-shim/files/passthrough-atags.patch	13ce67916c07a8c0882ad9d5127dc1e54a21b770
+++ packages/arm-kernel-shim/files/passthrough-atags.patch	13ce67916c07a8c0882ad9d5127dc1e54a21b770
@@ -0,0 +1,20 @@
+--- arm-kernel-shim-1.3/main.c~	2007-02-11 05:52:32.000000000 +1030
++++ arm-kernel-shim-1.3/main.c	2007-02-14 16:39:40.000000000 +1030
+@@ -100,6 +100,8 @@
+ 		  :  "+r" (offset)
+ 		  :: "lr", "cc");
+ 
++#if !defined (PASSTHROUGH_ATAGS)
++
+   p = (struct tag*) PHYS_PARAMS;
+ 
+ 	/* Always start with the CORE tag */
+@@ -151,6 +153,8 @@
+   p->hdr.tag		= ATAG_NONE;
+   p->hdr.size		= 0;
+ 
++#endif
++
+ 	/* Pass control to the kernel */
+   boot (0, MACH_TYPE, PHYS_PARAMS);
+ }
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.3.bb	f2125bdbb9b1ee2fe17ce293e4e0df55040ce537
+++ packages/arm-kernel-shim/arm-kernel-shim_1.3.bb	f76553f2032435dab3f62170824a3f9d82c6beaf
@@ -1,13 +1,14 @@ LICENSE = "GPL"
 DESCRIPTION = "ARM Kernel Shim"
 SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r3"
 
 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://config-nslu2.h \
 	   file://config-nas100d.h \
 	   file://config-dsmg600.h \
============================================================
--- packages/arm-kernel-shim/files/config-dsmg600.h	5d0a040bba86dbb05ec9fdeca1ce508c35b21ca4
+++ packages/arm-kernel-shim/files/config-dsmg600.h	c81a661c49e1b83e23275cfce5a32e290fc013a8
@@ -16,17 +16,20 @@
 
 #define PHYS_PARAMS	   0x00000100 /* Address for the parameter list */
 
-#define RAM_BANK0_START	   0x00000000
-#define RAM_BANK0_LENGTH   0x04000000
+//#define RAM_BANK0_START	   0x00000000
+//#define RAM_BANK0_LENGTH   0x04000000
 
 //#define RAM_BANK1_START	   0xd0000000
 //#define RAM_BANK1_LENGTH   0x10000000
 
-#define COMMANDLINE\
- "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8"
+//#define COMMANDLINE\
+// "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs2 rw noirqdebug console=ttyS0,115200n8"
 
 #define MACH_TYPE		   964
 
+/* The DSM-G600 RedBoot sets up the ATAGs correctly */
+#define PASSTHROUGH_ATAGS
+
 /* Uncomment one of these if you need to switch the CPU into a
    specific mode. */
 //#define FORCE_LITTLEENDIAN