[oe-commits] org.oe.dev arm-kernel-shim: Updated to latest upstream, and fixed the .boot section placement with a temporary Makefile ld command-line hack.
rwhitby commit
openembedded-commits at lists.openembedded.org
Wed Feb 7 12:47:46 UTC 2007
arm-kernel-shim: Updated to latest upstream, and fixed the .boot section placement with a temporary Makefile ld command-line hack.
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 68ffb08964c9cfd73d9e9df840bdb20967117de0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=68ffb08964c9cfd73d9e9df840bdb20967117de0
Files:
1
packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb
packages/arm-kernel-shim/arm-kernel-shim_1.2.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 -r4ffd7ccac8a446b58a26c5b2d0ddd8cdaa99c830 -r68ffb08964c9cfd73d9e9df840bdb20967117de0
#
#
#
# delete "packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb"
#
# add_file "packages/arm-kernel-shim/arm-kernel-shim_1.2.bb"
# content [4b4dbf456334953c1937b5f45927de0fd8e212f3]
#
# patch "packages/arm-kernel-shim/files/config-dsmg600.h"
# from [3d6ee88193bc315ff467fa41a149694d145b5551]
# to [c104f999b6804f585e9de1733bef8bdca962a4bf]
#
# patch "packages/arm-kernel-shim/files/config-fsg3.h"
# from [06beb9cd376adeef19def14d769a14d8f3c7e51c]
# to [981ca8e2ddb315270dc7cf09749e5660c9bea778]
#
# patch "packages/arm-kernel-shim/files/config-nas100d.h"
# from [7ef49ad164d3c0449939a6ec0cec913246228592]
# to [886a8aee91172babf167e25d69435bcb1f4e66e3]
#
# patch "packages/arm-kernel-shim/files/config-nslu2.h"
# from [3022269b2b971521beab0bbf2dd8d250b8ebca64]
# to [cb64580bbaa4abda3c74c43c9956160f1cfe5717]
#
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.2.bb 4b4dbf456334953c1937b5f45927de0fd8e212f3
+++ packages/arm-kernel-shim/arm-kernel-shim_1.2.bb 4b4dbf456334953c1937b5f45927de0fd8e212f3
@@ -0,0 +1,52 @@
+DESCRIPTION = "ARM Kernel Shim"
+SECTION = ""
+PRIORITY = "optional"
+HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader"
+LICENSE = "GPL"
+PR = "r1"
+
+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}/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
+ oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2
+ make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed"
+ # NAS100d
+ cp ${WORKDIR}/config-nas100d.h ${S}/config.h
+ rm -f ${S}/main.o
+ oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d
+ make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed"
+ # DSMG-600
+ cp ${WORKDIR}/config-dsmg600.h ${S}/config.h
+ rm -f ${S}/main.o
+ oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600
+ make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed"
+ # FSG-3
+ cp ${WORKDIR}/config-fsg3.h ${S}/config.h
+ 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}
+ 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}/
+ cp ${S}/arm-kernel-shim-fsg3.bin ${STAGING_LOADER_DIR}/
+}
============================================================
--- packages/arm-kernel-shim/files/config-dsmg600.h 3d6ee88193bc315ff467fa41a149694d145b5551
+++ packages/arm-kernel-shim/files/config-dsmg600.h c104f999b6804f585e9de1733bef8bdca962a4bf
@@ -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
============================================================
--- packages/arm-kernel-shim/files/config-fsg3.h 06beb9cd376adeef19def14d769a14d8f3c7e51c
+++ packages/arm-kernel-shim/files/config-fsg3.h 981ca8e2ddb315270dc7cf09749e5660c9bea778
@@ -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
============================================================
--- packages/arm-kernel-shim/files/config-nas100d.h 7ef49ad164d3c0449939a6ec0cec913246228592
+++ packages/arm-kernel-shim/files/config-nas100d.h 886a8aee91172babf167e25d69435bcb1f4e66e3
@@ -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
============================================================
--- packages/arm-kernel-shim/files/config-nslu2.h 3022269b2b971521beab0bbf2dd8d250b8ebca64
+++ packages/arm-kernel-shim/files/config-nslu2.h cb64580bbaa4abda3c74c43c9956160f1cfe5717
@@ -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
More information about the Openembedded-commits
mailing list