diff options
25 files changed, 64 insertions, 82 deletions
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 89ea08a157..4c849d095d 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -11,7 +11,6 @@ # slugos-[bl][at][gu] - a specific configuration encoded as follows: # # b or l - big or little endian -# set IXP4XX_MACHINE_ENDIAN to match # # a or t - ARM or Thumb instructions in the low level libraries # set ARM_INSTRUCTION_SET to match @@ -45,7 +44,6 @@ DISTRO_FEED ?= "unstable" # The following must also be set, they define the basic format of the build # -#IXP4XX_MACHINE_ENDIAN "be" or "le" #ARM_INSTRUCTION_SET "arm" or "thumb" #TARGET_OS "linux" or "linux-uclibc" #SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) @@ -55,7 +53,7 @@ DISTRO_FEED ?= "unstable" USE_NLS ?= "no" # To make errors easier to identify: -DISTRO_NAME ?= "INVALID-${IXP4XX_MACHINE_ENDIAN}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" +DISTRO_NAME ?= "INVALID-${SITEINFO_ENDIANESS}-${ARM_INSTRUCTION_SET}-${TARGET_OS}" DISTRO_TYPE ?= "INVALID" # The following must not be changed. diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf index 89e61cb386..23e8690752 100644 --- a/conf/distro/slugos-bag.conf +++ b/conf/distro/slugos-bag.conf @@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-bag" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -IXP4XX_MACHINE_ENDIAN = "be" +TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf index c6a609d3c5..5e461ff063 100644 --- a/conf/distro/slugos-bau.conf +++ b/conf/distro/slugos-bau.conf @@ -11,7 +11,7 @@ DISTRO_NAME ?= "slugos-bau" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "alpha" -IXP4XX_MACHINE_ENDIAN = "be" +TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf index a378551665..4fbdd9e37b 100644 --- a/conf/distro/slugos-btu.conf +++ b/conf/distro/slugos-btu.conf @@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-btu" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -IXP4XX_MACHINE_ENDIAN = "be" +TARGET_ARCH = "armeb" ARM_INSTRUCTION_SET = "thumb" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf index feefb88407..838d6cf48b 100644 --- a/conf/distro/slugos-lag.conf +++ b/conf/distro/slugos-lag.conf @@ -10,7 +10,7 @@ DISTRO_NAME ?= "slugos-lag" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -IXP4XX_MACHINE_ENDIAN = "le" +TARGET_ARCH = "arm" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf index 098f8684b7..7294c1dfd2 100644 --- a/conf/distro/slugos-lau.conf +++ b/conf/distro/slugos-lau.conf @@ -9,7 +9,7 @@ DISTRO_NAME ?= "slugos-lau" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "alpha" -IXP4XX_MACHINE_ENDIAN = "le" +TARGET_ARCH = "arm" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf index 2151446205..53fbb407a7 100644 --- a/conf/distro/slugos-ltu.conf +++ b/conf/distro/slugos-ltu.conf @@ -9,7 +9,7 @@ DISTRO_NAME ?= "slugos-ltu" # DISTRO_FEED ?= "unstable" DISTRO_TYPE ?= "beta" -IXP4XX_MACHINE_ENDIAN = "le" +TARGET_ARCH = "arm" ARM_INSTRUCTION_SET = "thumb" TARGET_OS = "linux-uclibc" SLUGOS_IMAGESEX ?= "big-endian" diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 9608b93885..b25b94d79f 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -18,7 +18,6 @@ TARGET_FPU = "soft" TARGET_OS = "linux" # select distro specific options to match that of the original LinkSys build -IXP4XX_MACHINE_ENDIAN = "be" ARM_INSTRUCTION_SET = "arm" THUMB_INTERWORK = "no" diff --git a/conf/machine/include/ixp4xx.conf b/conf/machine/include/ixp4xx.conf index 42ca723d90..0558e03e35 100644 --- a/conf/machine/include/ixp4xx.conf +++ b/conf/machine/include/ixp4xx.conf @@ -21,14 +21,6 @@ PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel" # <possible values> # description -IXP4XX_MACHINE_ENDIAN ?= "le" -# "be" "le" -# The memory byte sex and (on correctly implemented hardware - the IXP4XX is -# correct) the byte sex of the buses within the system. 'be' (big-endian) -# means that the first byte is the most significant byte on a bus, 'le' -# (little-endian) means that the first byte is the least significant byte. -# Default to little-endian mode (since EABI does not support big endian yet) - ARM_INSTRUCTION_SET = "arm" # "arm" "thumb" # The instruction set the compiler should use when generating application diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.conf index e5fea93912..1d212946e4 100644 --- a/conf/machine/include/tune-xscale.conf +++ b/conf/machine/include/tune-xscale.conf @@ -1,3 +1,3 @@ TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale" -PACKAGE_ARCH = "armv5te" +PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index cd02d7c821..d9737c9964 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -2,14 +2,12 @@ #@NAME: Generic IXP4XX kernel #@DESCRIPTION: Machine configuration for a generic ixp4xx board in big-endian mode -IXP4XX_MACHINE_ENDIAN = "be" - -require conf/machine/include/ixp4xx.conf - TARGET_ARCH = "armeb" +# PACKAGE_ARCH is set in tune-xscale.conf +PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb" MACHINE_ARCH = "ixp4xxbe" -PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb" +require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += "--big-endian" diff --git a/conf/machine/ixp4xxle.conf b/conf/machine/ixp4xxle.conf index e40b98b876..4747fa50c4 100644 --- a/conf/machine/ixp4xxle.conf +++ b/conf/machine/ixp4xxle.conf @@ -2,14 +2,12 @@ #@NAME: Generic IXP4XX kernel #@DESCRIPTION: Machine configuration for a generic ixp4xx board in little-endian mode -IXP4XX_MACHINE_ENDIAN = "le" - -require conf/machine/include/ixp4xx.conf - TARGET_ARCH = "arm" +# PACKAGE_ARCH is set in tune-xscale.conf +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" MACHINE_ARCH = "ixp4xxle" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" +require conf/machine/include/ixp4xx.conf EXTRA_IMAGECMD_jffs2 += " --little-endian" diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index fa42771331..966334a0d6 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -2,23 +2,20 @@ #@NAME: Linksys NSLU2 #@DESCRIPTION: Machine configuration for the Linksys NSLU2 product -# Note that IXP4XX_MACHINE_ENDIAN gets set by the DISTRO for the "nslu2" machine. +# Note that TARGET_ARCH gets set by the DISTRO for the "nslu2" machine. # (Yes, this was a mistake, but it's legacy and can't be easily changed now.) # The "nslu2" machine is deprecated - use "nslu2le" or "nslu2be" instead. require conf/machine/include/ixp4xx.conf # This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -TARGET_ARCH = "${@['armeb', 'arm'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +MACHINE_ARCH = "${@['ixp4xxbe', 'ixp4xxle'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" # This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -MACHINE_ARCH = "${@['ixp4xxbe', 'ixp4xxle'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +PACKAGE_ARCH = "${@['armeb', 'arm'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" # This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -PACKAGE_ARCH = "${@['armeb', 'arm'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +PACKAGE_EXTRA_ARCHS = "${@['ixp4xxbe nslu2be', 'ixp4xxle nslu2le'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" # This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -PACKAGE_EXTRA_ARCHS = "${@['ixp4xxbe nslu2be', 'ixp4xxle nslu2le'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" - -# This should eventually be removed (when we move from nslu2 to nslu2le/nslu2be). -EXTRA_IMAGECMD_jffs2 += "${@['--big-endian', '--little-endian'][bb.data.getVar('IXP4XX_MACHINE_ENDIAN', d, 1) == 'le']}" +EXTRA_IMAGECMD_jffs2 += "${@['--big-endian', '--little-endian'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}" diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb index a0be935613..64b7d8b8e0 100644 --- a/packages/images/slugos-image.bb +++ b/packages/images/slugos-image.bb @@ -123,7 +123,7 @@ slugos_pack_image() { ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ ${DEPLOY_DIR_IMAGE}/slug/ install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/ - install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${IXP4XX_MACHINE_ENDIAN} \ + install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/slug/vmlinuz install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2 @@ -137,7 +137,7 @@ slugos_pack_image() { # Create an image for the DSM-G600 as well install -d ${DEPLOY_DIR_IMAGE}/firmupgrade - install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${IXP4XX_MACHINE_ENDIAN} \ + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-dsmg600${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz @@ -154,7 +154,7 @@ slugos_pack_image() { # Create an image for the NAS 100d as well install -d ${DEPLOY_DIR_IMAGE}/firmupgrade - install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${IXP4XX_MACHINE_ENDIAN} \ + install -m 0755 ${DEPLOY_DIR_IMAGE}/zImage-nas100d${SITEINFO_ENDIANESS} \ ${DEPLOY_DIR_IMAGE}/firmupgrade/ip-ramdisk install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ ${DEPLOY_DIR_IMAGE}/firmupgrade/rootfs.gz diff --git a/packages/ixp425-eth/ixp400-eth_1.4.bb b/packages/ixp425-eth/ixp400-eth_1.4.bb index ad20f51b6b..6b1ff0c8d2 100644 --- a/packages/ixp425-eth/ixp400-eth_1.4.bb +++ b/packages/ixp425-eth/ixp400-eth_1.4.bb @@ -28,7 +28,7 @@ inherit module # This is a somewhat arbitrary choice: OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal" -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ diff --git a/packages/ixp425-eth/ixp400-eth_1.5.1.bb b/packages/ixp425-eth/ixp400-eth_1.5.1.bb index 66e765940e..2fa04fc672 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.1.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.1.bb @@ -39,7 +39,7 @@ inherit module # This is a somewhat arbitrary choice: OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal" -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "-DIX_OSAL_ENSURE_ON=1" # The following controls the name of the ethernet devices which get diff --git a/packages/ixp425-eth/ixp400-eth_1.5.bb b/packages/ixp425-eth/ixp400-eth_1.5.bb index a708bd96f4..5e25deb1d4 100644 --- a/packages/ixp425-eth/ixp400-eth_1.5.bb +++ b/packages/ixp425-eth/ixp400-eth_1.5.bb @@ -38,7 +38,7 @@ inherit module # This is a somewhat arbitrary choice: OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal" -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "-DIX_OSAL_ENSURE_ON=1" # The following controls the name of the ethernet devices which get diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb index 03fb7fbdb3..009d45d67a 100644 --- a/packages/ixp4xx/ixp-osal_2.0.bb +++ b/packages/ixp4xx/ixp-osal_2.0.bb @@ -33,7 +33,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ diff --git a/packages/ixp4xx/ixp-osal_2.1.1.bb b/packages/ixp4xx/ixp-osal_2.1.1.bb index 8a43d49117..481033fd0a 100644 --- a/packages/ixp4xx/ixp-osal_2.1.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.1.bb @@ -49,7 +49,7 @@ do_pre_patch () { addtask pre_patch before do_patch -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb index 8b1bce6720..dd70289598 100644 --- a/packages/ixp4xx/ixp-osal_2.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.bb @@ -37,7 +37,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/ixp4xx/ixp4xx-csr_2.0.bb b/packages/ixp4xx/ixp4xx-csr_2.0.bb index fefb98858f..a160fe4609 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.0.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.0.bb @@ -38,7 +38,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" OSAL_PATH = "lib/ixp425/linux/${IX_TARGET}" # This is a somewhat arbitrary choice: diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb index 6d4c9d8c02..cc063b523e 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb @@ -53,7 +53,7 @@ do_pre_patch () { addtask pre_patch before do_patch -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.bb index 9be5072f29..e72de05071 100644 --- a/packages/ixp4xx/ixp4xx-csr_2.1.bb +++ b/packages/ixp4xx/ixp4xx-csr_2.1.bb @@ -46,7 +46,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" inherit module -IX_TARGET = "linux${IXP4XX_MACHINE_ENDIAN}" +IX_TARGET = "linux${SITEINFO_ENDIANESS}" IX_ENSURE = "" #IX_ENSURE = "IX_OSAL_ENSURE_ON=1" diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 28b8d3b559..1a064a17e5 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -186,7 +186,7 @@ EXTRA_OEMAKE += "MAKEFLAGS='--no-print-directory'" do_configure_prepend() { rm -f ${S}/.config echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' - if test '${IXP4XX_MACHINE_ENDIAN}' = be + if test '${SITEINFO_ENDIANESS}' = be then echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi @@ -246,70 +246,70 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}-${MACHINE_ARCH}-${KERNEL_VERSION nslu2_MACHID = "597" PACKAGES += "kernel-image-nslu2" PKG_kernel-image-nslu2 = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-nslu2 = "nslu2${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-nslu2 = "Linux kernel for the LinkSys NSLU2" -FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-nslu2 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-nslu2 () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-nslu2 () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nslu2${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for Loft: loft_MACHID = "849" PACKAGES += "kernel-image-loft" PKG_kernel-image-loft = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-loft = "loft${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-loft = "loft${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-loft = "Linux kernel for the Giant Shoulder Inc. Loft board" -FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-loft = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-loft () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-loft () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-loft${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for the NAS100D board: nas100d_MACHID = "865" PACKAGES += "kernel-image-nas100d" PKG_kernel-image-nas100d = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-nas100d = "nas100d${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-nas100d = "nas100d${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-nas100d = "Linux kernel for the IOMega NAS100D" -FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-nas100d = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-nas100d () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-nas100d () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-nas100d${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for the DSMG600 board: dsmg600_MACHID = "964" PACKAGES += "kernel-image-dsmg600" PKG_kernel-image-dsmg600 = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-dsmg600 = "dsmg600${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-dsmg600 = "Linux kernel for the D-Link DSM-G600" -FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-dsmg600 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-dsmg600 () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-dsmg600 () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-dsmg600${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } # The correct settings for the FSG-3 board: fsg3_MACHID = "1091" PACKAGES += "kernel-image-fsg3" PKG_kernel-image-fsg3 = "kernel-image-${KERNEL_VERSION}" -PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${IXP4XX_MACHINE_ENDIAN}" +PACKAGE_ARCH_kernel-image-fsg3 = "fsg3${SITEINFO_ENDIANESS}" DESCRIPTION_kernel-image-fsg3 = "Linux kernel for the Freecom FSG-3" -FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION}" +FILES_kernel-image-fsg3 = "/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION}" pkg_postinst_kernel-image-fsg3 () { - update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } pkg_postrm_kernel-image-fsg3 () { - update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${IXP4XX_MACHINE_ENDIAN}-${KERNEL_VERSION} || true + update-alternatives --remove ${KERNEL_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-fsg3${SITEINFO_ENDIANESS}-${KERNEL_VERSION} || true } #FIXUP: the correct instructions to copy the kernel prepended with the le fixup @@ -356,11 +356,11 @@ do_install_append() { install_image '${MACHINE_ARCH}' # Add the machine specific images, with appropriate suffixes - install_image 'nslu2${IXP4XX_MACHINE_ENDIAN}' '${nslu2_MACHID}' - install_image 'loft${IXP4XX_MACHINE_ENDIAN}' '${loft_MACHID}' - install_image 'nas100d${IXP4XX_MACHINE_ENDIAN}' '${nas100d_MACHID}' - install_image 'dsmg600${IXP4XX_MACHINE_ENDIAN}' '${dsmg600_MACHID}' - install_image 'fsg3${IXP4XX_MACHINE_ENDIAN}' '${fsg3_MACHID}' + install_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}' + install_image 'loft${SITEINFO_ENDIANESS}' '${loft_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}" @@ -374,11 +374,11 @@ do_deploy() { deploy_image '${MACHINE_ARCH}' # And the machine specific images - deploy_image 'nslu2${IXP4XX_MACHINE_ENDIAN}' '${nslu2_MACHID}' - deploy_image 'loft${IXP4XX_MACHINE_ENDIAN}' '${loft_MACHID}' - deploy_image 'nas100d${IXP4XX_MACHINE_ENDIAN}' '${nas100d_MACHID}' - deploy_image 'dsmg600${IXP4XX_MACHINE_ENDIAN}' '${dsmg600_MACHID}' - deploy_image 'fsg3${IXP4XX_MACHINE_ENDIAN}' '${fsg3_MACHID}' + deploy_image 'nslu2${SITEINFO_ENDIANESS}' '${nslu2_MACHID}' + deploy_image 'loft${SITEINFO_ENDIANESS}' '${loft_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 diff --git a/packages/obsolete/nslu2/nslu2-kernel.inc b/packages/obsolete/nslu2/nslu2-kernel.inc index a622c50f08..6b866100ca 100644 --- a/packages/obsolete/nslu2/nslu2-kernel.inc +++ b/packages/obsolete/nslu2/nslu2-kernel.inc @@ -150,7 +150,7 @@ N2K_PATCHES ?= "" # Image suffix - actually set in conf/machine/nslu2.conf as it is also # used by anything which needs to know the name of the generated image. # Should be overridden in the distro if patches or defconfig are changed. -N2K_SUFFIX ?= "nslu2${IXP4XX_MACHINE_ENDIAN}" +N2K_SUFFIX ?= "nslu2${SITEINFO_ENDIANESS}" SRC_URI = "${N2K_SRCURI}" SRC_URI += "${N2K_PATCHES}" @@ -186,7 +186,7 @@ addtask unpacklocal before do_patch after do_unpack do_configure_prepend() { rm -f ${S}/.config echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' - if test '${IXP4XX_MACHINE_ENDIAN}' = be + if test '${SITEINFO_ENDIANESS}' = be then echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi |