diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-11 22:19:49 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-11 22:19:49 +0000 |
commit | 685b95cae8516570c7e445910b026b576d281808 (patch) | |
tree | 96f118519f8cb05b397a663d0ef30eed1bea3e33 | |
parent | 6f7bd413184fad59110c5252d0dc3fc059fe7c02 (diff) |
slugos: make slugos-??? default to big-endian throughout in slugos.conf
- the JFFS2 format can be overridden in the DISTRO .conf (unlike the
other slugos configuration parameters) It can also be changed in
local.conf if using a slugos-??? build directly.
-rw-r--r-- | conf/distro/slugos-bag.conf | 1 | ||||
-rw-r--r-- | conf/distro/slugos-bau.conf | 1 | ||||
-rw-r--r-- | conf/distro/slugos-btu.conf | 1 | ||||
-rw-r--r-- | conf/distro/slugos-lag.conf | 1 | ||||
-rw-r--r-- | conf/distro/slugos-lau.conf | 1 | ||||
-rw-r--r-- | conf/distro/slugos-ltu.conf | 1 | ||||
-rw-r--r-- | conf/distro/slugos.conf | 4 | ||||
-rw-r--r-- | packages/linux/ixp4xx-kernel.inc | 14 |
8 files changed, 20 insertions, 4 deletions
diff --git a/conf/distro/slugos-bag.conf b/conf/distro/slugos-bag.conf index 9d59722b48..c1f5ef8d03 100644 --- a/conf/distro/slugos-bag.conf +++ b/conf/distro/slugos-bag.conf @@ -13,6 +13,7 @@ DISTRO_TYPE ?= "beta" ARCH_BYTE_SEX = "be" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" +SLUGOS_IMAGESEX ?= "big-endian" FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-bag/cross/${DISTRO_FEED}" FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-bag/native/${DISTRO_FEED}" diff --git a/conf/distro/slugos-bau.conf b/conf/distro/slugos-bau.conf index ab25777a07..72bafc1c1c 100644 --- a/conf/distro/slugos-bau.conf +++ b/conf/distro/slugos-bau.conf @@ -14,5 +14,6 @@ DISTRO_TYPE ?= "alpha" ARCH_BYTE_SEX = "be" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-uclibc" +SLUGOS_IMAGESEX ?= "big-endian" include conf/distro/slugos.conf diff --git a/conf/distro/slugos-btu.conf b/conf/distro/slugos-btu.conf index 6c96441076..8c06605bc7 100644 --- a/conf/distro/slugos-btu.conf +++ b/conf/distro/slugos-btu.conf @@ -13,6 +13,7 @@ DISTRO_TYPE ?= "beta" ARCH_BYTE_SEX = "be" ARM_INSTRUCTION_SET = "thumb" TARGET_OS = "linux-uclibc" +SLUGOS_IMAGESEX ?= "big-endian" FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/slugos-btu/cross/${DISTRO_FEED}" FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/slugos-btu/native/${DISTRO_FEED}" diff --git a/conf/distro/slugos-lag.conf b/conf/distro/slugos-lag.conf index 644c09b6ed..c29958439b 100644 --- a/conf/distro/slugos-lag.conf +++ b/conf/distro/slugos-lag.conf @@ -12,5 +12,6 @@ DISTRO_TYPE ?= "alpha" ARCH_BYTE_SEX = "le" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux" +SLUGOS_IMAGESEX ?= "big-endian" include conf/distro/slugos.conf diff --git a/conf/distro/slugos-lau.conf b/conf/distro/slugos-lau.conf index 0866f80763..3233f76364 100644 --- a/conf/distro/slugos-lau.conf +++ b/conf/distro/slugos-lau.conf @@ -12,5 +12,6 @@ DISTRO_TYPE ?= "alpha" ARCH_BYTE_SEX = "le" ARM_INSTRUCTION_SET = "arm" TARGET_OS = "linux-uclibc" +SLUGOS_IMAGESEX ?= "big-endian" include conf/distro/slugos.conf diff --git a/conf/distro/slugos-ltu.conf b/conf/distro/slugos-ltu.conf index 06193c9169..6d99e629ee 100644 --- a/conf/distro/slugos-ltu.conf +++ b/conf/distro/slugos-ltu.conf @@ -12,5 +12,6 @@ DISTRO_TYPE ?= "alpha" ARCH_BYTE_SEX = "le" ARM_INSTRUCTION_SET = "thumb" TARGET_OS = "linux-uclibc" +SLUGOS_IMAGESEX ?= "big-endian" include conf/distro/slugos.conf diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index 15a2788958..4cc33888d7 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -42,6 +42,7 @@ #ARCH_BYTE_SEX "be" or "le" #ARM_INSTRUCTION_SET "arm" or "thumb" #TARGET_OS "linux" or "linux-uclibc" +#SLUGOS_IMAGESEX "big-endian" or "little-endian" (JFFS2 format) # The following need not be set, the defaults should be adequate #USE_NLS = "no" or "yes" @@ -70,9 +71,6 @@ DISTRO_BASE = ":slugos" # change the generated image). SLUGOS_IMAGENAME ?= "${DISTRO_NAME}" -# default to native-endian JFFS2 partitions -SLUGOS_IMAGESEX ?= "${@['big-endian', 'little-endian'][bb.data.getVar('ARCH_BYTE_SEX', d, 1) == 'le']}" - # pull in the frozen list of bbfiles - this sets BBFILES and this will override any # setting in local.conf Since this depends on ${DISTRO} it doesn't actually do # anything by default unless conf/distro/${DISTRO}-packages.conf exists. diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index bae5e96bd1..e01ba7e511 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -213,7 +213,19 @@ do_configure_prepend() { then echo 'CONFIG_CPU_BIG_ENDIAN=y' >>'${S}/.config' fi - sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' '${WORKDIR}/defconfig' >>'${S}/.config' + if test '${SLUGOS_IMAGESEX}' = big-endian + then + echo 'CONFIG_JFFS2_BIG_ENDIAN=y' >>'${S}/.config' + fi + if test '${SLUGOS_IMAGESEX}' = little-endian + then + echo 'CONFIG_JFFS2_LITTLE_ENDIAN=y' >>'${S}/.config' + fi + sed -e '/CONFIG_CPU_BIG_ENDIAN/d' -e '/CONFIG_CMDLINE=/d' \ + -e '/CONFIG_JFFS2_NATIVE_ENDIAN=/d' \ + -e '/CONFIG_JFFS2_BIG_ENDIAN=/d' \ + -e '/CONFIG_JFFS2_LITTLE_ENDIAN=/d' \ + '${WORKDIR}/defconfig' >>'${S}/.config' rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \ ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch } |