[oe-commits] org.oe.dev slugos: backed out of using arm-kernel-shim instead of the cmdline hacks, cause arm-kernel-shim doesn't work on LE
rwhitby commit
openembedded-commits at lists.openembedded.org
Fri Feb 9 03:49:01 UTC 2007
slugos: backed out of using arm-kernel-shim instead of the cmdline hacks, cause arm-kernel-shim doesn't work on LE
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: a0121d557ac756c256ad00d8688869905c1f60fc
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a0121d557ac756c256ad00d8688869905c1f60fc
Files:
1
packages/linux/ixp4xx-kernel/2.6.19/series
packages/linux/ixp4xx-kernel/2.6.20/series
packages/linux/ixp4xx-kernel.inc
packages/linux/ixp4xx-kernel_2.6.19.bb
packages/linux/ixp4xx-kernel_2.6.20.bb
Diffs:
#
# mt diff -rbc846576fe14e151a29460cc9cbd6c1cd7c00dbd -ra0121d557ac756c256ad00d8688869905c1f60fc
#
#
#
# patch "packages/linux/ixp4xx-kernel/2.6.19/series"
# from [ec9b924bc0c2e2462842cdf66baf044f5b84e74c]
# to [3c53ce4c2544fb426ff52194e206e5be264ccac6]
#
# patch "packages/linux/ixp4xx-kernel/2.6.20/series"
# from [cf976d32f2fde8052ef75d579b214d9f300bac87]
# to [2127f13095099bf4dc6fc5fdacf8cf9e12b73512]
#
# patch "packages/linux/ixp4xx-kernel.inc"
# from [909f5b8dfd461bff27acc4c8b97e62d8181c81cc]
# to [a87e8299446959f558063b997d7e3e78cc03151a]
#
# patch "packages/linux/ixp4xx-kernel_2.6.19.bb"
# from [e56c1da7fc7ecce814984a2a86e39b1e3ee70923]
# to [b26607155e3e84bb060423feb62e3778765489c7]
#
# patch "packages/linux/ixp4xx-kernel_2.6.20.bb"
# from [52f5621661ba96970cbb6a3b5f0e96b2f10dd0ab]
# to [57d3f98f9cf3aae923078ea1083136178f5ce8f5]
#
============================================================
--- packages/linux/ixp4xx-kernel/2.6.19/series ec9b924bc0c2e2462842cdf66baf044f5b84e74c
+++ packages/linux/ixp4xx-kernel/2.6.19/series 3c53ce4c2544fb426ff52194e206e5be264ccac6
@@ -39,9 +39,8 @@ 88-dsmg600-dflt-cmdline.patch
86-nas100d-rtc-fixup.patch
87-dsmg600-rtc-fixup.patch
88-dsmg600-dflt-cmdline.patch
-# These are now done via arm-kernel-shim
-#88-nas100d-dflt-cmdline.patch
-#88-nslu2-dflt-cmdline.patch
+88-nas100d-dflt-cmdline.patch
+88-nslu2-dflt-cmdline.patch
95-pata-ixp4xx.patch
96-fsg3-support.patch
97-avila-setup-pata.patch
============================================================
--- packages/linux/ixp4xx-kernel/2.6.20/series cf976d32f2fde8052ef75d579b214d9f300bac87
+++ packages/linux/ixp4xx-kernel/2.6.20/series 2127f13095099bf4dc6fc5fdacf8cf9e12b73512
@@ -35,9 +35,8 @@ 88-dsmg600-dflt-cmdline.patch
86-nas100d-rtc-fixup.patch
87-dsmg600-rtc-fixup.patch
88-dsmg600-dflt-cmdline.patch
-# These are now done via arm-kernel-shim
-#88-nas100d-dflt-cmdline.patch
-#88-nslu2-dflt-cmdline.patch
+88-nas100d-dflt-cmdline.patch
+88-nslu2-dflt-cmdline.patch
96-fsg3-support.patch
98-sata_via-pata-support-upstream.patch
99-avila-mtd-microcode.patch
============================================================
--- packages/linux/ixp4xx-kernel.inc 909f5b8dfd461bff27acc4c8b97e62d8181c81cc
+++ packages/linux/ixp4xx-kernel.inc a87e8299446959f558063b997d7e3e78cc03151a
@@ -26,8 +26,6 @@ LICENSE = "GPL"
DESCRIPTION = "Linux kernel for the Intel IXP4xx device"
LICENSE = "GPL"
-DEPENDS += "arm-kernel-shim"
-
# Linux kernel source has the general form linux-X.Y.Z-patchP,
# X.Y is the major version number, Z (which may have multiple
# parts) is a sub-version and 'patch' is something like 'mm' or
@@ -318,20 +316,18 @@ pkg_postrm_kernel () {
# copy the zImage and append the appropriate shim
# dest: where to copy to
# cmdline: command line to pass to image
-# machine: machine shim to prepend, empty for none
+# machine-id: decimal machine id to prepend, empty for none
copy_image() {
- local shim
+ local setmach
- shim="/dev/null"
- test -n "$2" && shim="${STAGING_LOADER_DIR}/arm-kernel-shim-$2.bin"
+ setmach=""
+ test -n "$2" && setmach="wb $2 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;"
- rm -f "$1".new "$1".shim
- cat $shim ${KERNEL_OUTPUT} > "$1".shim
- devio '<<'"$1"'.shim' >"$1".new '${FIXUP}' || {
+ rm -f "$1".new
+ devio '<<${KERNEL_OUTPUT}' >"$1".new "$setmach"'${FIXUP}' || {
echo 'ERROR: ${KERNEL_OUTPUT}: failed to copy zImage' >&2
return 1
}
- rm -f "$1".shim
mv "$1".new "$1"
}
@@ -346,10 +342,10 @@ do_install_append() {
install_image '${MACHINE_ARCH}'
# Add the machine specific images, with appropriate suffixes
- install_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2'
- install_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d'
- install_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
- install_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
+ install_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}'
+ install_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}'
+ install_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}'
+ install_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}'
}
do_deploy[dirs] = "${S}"
@@ -363,10 +359,10 @@ do_deploy() {
deploy_image '${MACHINE_ARCH}'
# And the machine specific images
- deploy_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2'
- deploy_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d'
- deploy_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
- deploy_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
+ deploy_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}'
+ deploy_image 'nas100d${SITEINFO_ENDIANESS}' '${nas100d_MACHID}'
+ deploy_image 'dsmg600${SITEINFO_ENDIANESS}' '${dsmg600_MACHID}'
+ deploy_image 'fsg3${SITEINFO_ENDIANESS}' '${fsg3_MACHID}'
}
addtask deploy before do_build after do_compile
============================================================
--- packages/linux/ixp4xx-kernel_2.6.19.bb e56c1da7fc7ecce814984a2a86e39b1e3ee70923
+++ packages/linux/ixp4xx-kernel_2.6.19.bb b26607155e3e84bb060423feb62e3778765489c7
@@ -23,3 +23,16 @@ SRC_URI += "file://series"
SRC_URI += "file://defconfig"
SRC_URI += "file://series"
+
+# Remove the specific cmdline hacking patches if we are not building for nslu2.
+addtask remove_cmdline_hacks before do_patch after do_unpack
+do_remove_cmdline_hacks() {
+
+# if [ "${MACHINE}" != "nslu2" ] ; then
+ sed -e '/88-nas100d-dflt-cmdline.patch/d' \
+ -e '/88-nslu2-dflt-cmdline.patch/d' \
+ '${WORKDIR}/series' > '${WORKDIR}/series.new'
+ mv '${WORKDIR}/series.new' '${WORKDIR}/series'
+# fi
+
+}
============================================================
--- packages/linux/ixp4xx-kernel_2.6.20.bb 52f5621661ba96970cbb6a3b5f0e96b2f10dd0ab
+++ packages/linux/ixp4xx-kernel_2.6.20.bb 57d3f98f9cf3aae923078ea1083136178f5ce8f5
@@ -23,3 +23,16 @@ SRC_URI += "file://series"
SRC_URI += "file://defconfig"
SRC_URI += "file://series"
+
+# Remove the specific cmdline hacking patches if we are not building for nslu2.
+addtask remove_cmdline_hacks before do_patch after do_unpack
+do_remove_cmdline_hacks() {
+
+ if [ "${MACHINE}" != "nslu2" ] ; then
+ sed -e '/88-nas100d-dflt-cmdline.patch/d' \
+ -e '/88-nslu2-dflt-cmdline.patch/d' \
+ '${WORKDIR}/series' > '${WORKDIR}/series.new'
+ mv '${WORKDIR}/series.new' '${WORKDIR}/series'
+ fi
+
+}
More information about the Openembedded-commits
mailing list