merge of '531b56411734b2c857cc1bcb737fcccef9833ab1'

     and '5c2c70f1ecf63e84f8c487423e9c7d65a4f05d8e'

6 files changed, 28 insertions, 13 deletions

diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb
index e994e13814..aa7c7cd64c 100644
--- a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb
+++ b/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb
@@ -3,20 +3,23 @@ SECTION = ""
 PRIORITY = "optional"
 HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
 LICENSE = "GPL"
-PR = "r2"
+PR = "r1"
 
-SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
-	   file://disable-commandline.patch;patch=1 \
+COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
+
+SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \
+	   file://place-boot-section.patch;patch=1 \
 	   file://config-nslu2.h \
 	   file://config-nas100d.h \
 	   file://config-dsmg600.h \
 	   file://config-fsg3.h"
 
-S = ${WORKDIR}/apex-${PV}/arm-kernel-shim
+S = ${WORKDIR}/arm-kernel-shim-${PV}
 
 EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
 
 oe_runmake() {
+	mv ${S}/config.h ${S}/config.h.orig
 	# NSLU2
 	cp ${WORKDIR}/config-nslu2.h ${S}/config.h
 	rm -f ${S}/main.o
@@ -37,11 +40,11 @@ oe_runmake() {
 	rm -f ${S}/main.o
 	oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3
 	make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed"
+	mv ${S}/config.h.orig ${S}/config.h
 }
 
 do_populate_staging() {
 	install -d ${STAGING_LOADER_DIR}
-	. ${CONFIG_SITE}
 	cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/
 	cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/
 	cp ${S}/arm-kernel-shim-dsmg600.bin ${STAGING_LOADER_DIR}/
diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h
index b0f37b3e3b..cd331159e0 100644
--- a/packages/arm-kernel-shim/files/config-dsmg600.h
+++ b/packages/arm-kernel-shim/files/config-dsmg600.h
@@ -14,7 +14,7 @@
 #if !defined (__CONFIG_H__)
 #    define   __CONFIG_H__
 
-#define PHYS_PARAMS		0xc0000100 /* Address for the parameter list */
+#define PHYS_PARAMS	   0x00000100 /* Address for the parameter list */
 
 #define RAM_BANK0_START	   0x00000000
 #define RAM_BANK0_LENGTH   0x04000000
diff --git a/packages/arm-kernel-shim/files/config-fsg3.h b/packages/arm-kernel-shim/files/config-fsg3.h
index 1222d959c2..e2cdf8abd4 100644
--- a/packages/arm-kernel-shim/files/config-fsg3.h
+++ b/packages/arm-kernel-shim/files/config-fsg3.h
@@ -14,7 +14,7 @@
 #if !defined (__CONFIG_H__)
 #    define   __CONFIG_H__
 
-#define PHYS_PARAMS		0xc0000100 /* Address for the parameter list */
+#define PHYS_PARAMS	   0x00000100 /* Address for the parameter list */
 
 #define RAM_BANK0_START	   0x00000000
 #define RAM_BANK0_LENGTH   0x04000000
diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h
index 5f148a666a..4389644cf0 100644
--- a/packages/arm-kernel-shim/files/config-nas100d.h
+++ b/packages/arm-kernel-shim/files/config-nas100d.h
@@ -14,7 +14,7 @@
 #if !defined (__CONFIG_H__)
 #    define   __CONFIG_H__
 
-#define PHYS_PARAMS		0xc0000100 /* Address for the parameter list */
+#define PHYS_PARAMS	   0x00000100 /* Address for the parameter list */
 
 #define RAM_BANK0_START	   0x00000000
 #define RAM_BANK0_LENGTH   0x04000000
@@ -22,8 +22,8 @@
 //#define RAM_BANK1_START	   0xd0000000
 //#define RAM_BANK1_LENGTH   0x10000000
 
-//#define COMMANDLINE\
-// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs"
+#define COMMANDLINE\
+ "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs rw noirqdebug console=ttyS0,115200n8"
 
 #define MACH_TYPE		   865
 
diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h
index 7547061165..2262b57668 100644
--- a/packages/arm-kernel-shim/files/config-nslu2.h
+++ b/packages/arm-kernel-shim/files/config-nslu2.h
@@ -14,7 +14,7 @@
 #if !defined (__CONFIG_H__)
 #    define   __CONFIG_H__
 
-#define PHYS_PARAMS		0xc0000100 /* Address for the parameter list */
+#define PHYS_PARAMS	   0x00000100 /* Address for the parameter list */
 
 #define RAM_BANK0_START	   0x00000000
 #define RAM_BANK0_LENGTH   0x02000000
@@ -22,8 +22,8 @@
 //#define RAM_BANK1_START	   0xd0000000
 //#define RAM_BANK1_LENGTH   0x10000000
 
-//#define COMMANDLINE\
-// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs"
+#define COMMANDLINE\
+ "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs rw noirqdebug console=ttyS0,115200n8"
 
 #define MACH_TYPE		   597
 
diff --git a/packages/arm-kernel-shim/files/place-boot-section.patch b/packages/arm-kernel-shim/files/place-boot-section.patch
new file mode 100644
index 0000000000..6e6c9460a5
--- /dev/null
+++ b/packages/arm-kernel-shim/files/place-boot-section.patch
@@ -0,0 +1,12 @@
+--- arm-kernel-shim-1.2/Makefile~	2007-02-06 16:44:31.000000000 +1030
++++ arm-kernel-shim-1.2/Makefile	2007-02-06 16:56:12.000000000 +1030
+@@ -9,7 +9,8 @@
+ OBJCOPY=$(TOOLS)objcopy
+ 
+ CFLAGS:=-g -Os -nostartfiles -nostdlib
+-LDFLAGS:= -g -X -Map shim.map -Ttext 0
++# LDFLAGS:= -g -X -Map shim.map -Ttext 0
++LDFLAGS:= -g -X -Map shim.map -Ttext 0 --section-start .boot=1fb
+ 
+ SRCS:= shim.lds main.c
+ OBJS:=$(SRCS:.c=.o)