summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-02-09 01:31:13 +0000
committerRod Whitby <rod@whitby.id.au>2007-02-09 01:31:13 +0000
commit8f41141595630c6bca5f28e9edf6069750674da3 (patch)
treea3eb1a6113ad7760cf780a6fb9f27b0a8c2b33d9
parent04e3e9944e57cd709a1ffe5ab617a95a66cb82e9 (diff)
arm-kernel-shim: Upstream bug fixes for little-endian
-rw-r--r--packages/arm-kernel-shim/arm-kernel-shim_1.3.bb (renamed from packages/arm-kernel-shim/arm-kernel-shim_1.2.bb)19
-rw-r--r--packages/arm-kernel-shim/files/disable-commandline.patch28
-rw-r--r--packages/arm-kernel-shim/files/place-boot-section.patch12
3 files changed, 9 insertions, 50 deletions
diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb
index aa7c7cd64c..ac9df9579b 100644
--- a/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb
+++ b/packages/arm-kernel-shim/arm-kernel-shim_1.3.bb
@@ -8,13 +8,12 @@ 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}
+S = ${WORKDIR}/arm-kernel-shim-${PV}/${PV}
EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}"
@@ -23,23 +22,23 @@ oe_runmake() {
# 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"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${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"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${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"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${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"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed"
mv ${S}/config.h.orig ${S}/config.h
}
diff --git a/packages/arm-kernel-shim/files/disable-commandline.patch b/packages/arm-kernel-shim/files/disable-commandline.patch
deleted file mode 100644
index d8c59f1a6b..0000000000
--- a/packages/arm-kernel-shim/files/disable-commandline.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- arm-kernel-shim/main.c~ 2006-07-21 11:12:07.000000000 +0930
-+++ arm-kernel-shim/main.c 2007-01-28 11:56:35.000000000 +1030
-@@ -47,7 +47,9 @@
-
- #define NAKED __attribute__((naked))
-
-+#if defined (COMMANDLINE)
- const char __attribute__((section(".rodata"))) cmdline[] = COMMANDLINE;
-+#endif
-
- void NAKED __attribute__((section(".boot"))) boot (u32 r0, u32 r1, u32 r2)
- {
-@@ -82,6 +84,7 @@
- pv += H_SIZE(pv)*4;
- #endif
-
-+#if defined (COMMANDLINE)
- /* Command line */
- H_SIZE(pv) = tag_size(tag_cmdline) + (sizeof (cmdline)+1+3)/4;
- H_TAG(pv) = ATAG_CMDLINE;
-@@ -91,6 +94,7 @@
- P_CMDLINE(pv)->cmdline[i] = cmdline[i];
- }
- pv += H_SIZE(pv)*4;
-+#endif
-
- /* End */
- H_SIZE(pv) = 0;
diff --git a/packages/arm-kernel-shim/files/place-boot-section.patch b/packages/arm-kernel-shim/files/place-boot-section.patch
deleted file mode 100644
index 6e6c9460a5..0000000000
--- a/packages/arm-kernel-shim/files/place-boot-section.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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)