diff options
Diffstat (limited to 'packages/linux/ixp4xx-kernel.inc')
| -rw-r--r-- | packages/linux/ixp4xx-kernel.inc | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index d2cb649437..3a80703420 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -26,8 +26,6 @@ SECTION = "kernel" 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 |