From b59f722c216b73598c4c5fd7504a94dd966410cb Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 13 Nov 2006 12:32:18 +0000 Subject: apex: now works for nslu2 --- packages/apex/apex_1.4.5.bb | 45 ------------------------------------------ packages/apex/apex_1.4.7.bb | 46 +++++++++++++++++++++++++++++++++++++++++++ packages/apex/nslu2/defconfig | 13 +++++++----- 3 files changed, 54 insertions(+), 50 deletions(-) delete mode 100644 packages/apex/apex_1.4.5.bb create mode 100644 packages/apex/apex_1.4.7.bb (limited to 'packages') diff --git a/packages/apex/apex_1.4.5.bb b/packages/apex/apex_1.4.5.bb deleted file mode 100644 index 35d772aa0b..0000000000 --- a/packages/apex/apex_1.4.5.bb +++ /dev/null @@ -1,45 +0,0 @@ -DESCRIPTION = "APEX Boot Loader" -SECTION = "" -PRIORITY = "optional" -HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ - file://defconfig" - -EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" - -oe_runmake() { - oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" - make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed" -} - -# FIXME - make this the same as the distro kernel compilation -CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug" - -# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head -# of the .config file and remove any settings in defconfig then append -# defconfig to .config -do_configure() { - rm -f ${S}/.config - echo "CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"" >>'${S}/.config' - if test '${ARCH_BYTE_SEX}' = be - then - echo 'CONFIG_USER_BIGENDIAN=y' >>'${S}/.config' - echo 'CONFIG_BIGENDIAN=y' >>'${S}/.config' - else - echo 'CONFIG_USER_LITTLEENDIAN=y' >>'${S}/.config' - echo 'CONFIG_LITTLEENDIAN=y' >>'${S}/.config' - fi - sed -e '/CONFIG_USER_BIGENDIAN/d' -e '/CONFIG_USER_LITTLEENDIAN/d' \ - -e '/CONFIG_ENV_DEFAULT_CMDLINE/d' \ - ${S}/src/mach-ixp42x/debian-nslu2-arm_config >>${S}/.config - oe_runmake oldconfig -} - -do_populate_staging() { - install -d ${STAGING_LOADER_DIR} - # FIXME - arch-arm should not be hard-coded - install -m 0755 src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin -} diff --git a/packages/apex/apex_1.4.7.bb b/packages/apex/apex_1.4.7.bb new file mode 100644 index 0000000000..0a7d5520fc --- /dev/null +++ b/packages/apex/apex_1.4.7.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "APEX Boot Loader" +SECTION = "" +PRIORITY = "optional" +HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ + file://defconfig" + +EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" + +oe_runmake() { + oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" + make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${CROSS_DIR}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed" +} + +# FIXME - make this the same as the distro kernel compilation +CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug" + +# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head +# of the .config file and remove any settings in defconfig then append +# defconfig to .config +do_configure() { + rm -f ${S}/.config + if test '${ARCH_BYTE_SEX}' = be + then + sed -e 's/.*CONFIG_USER_BIGENDIAN.*/CONFIG_USER_BIGENDIAN=y/' \ + -e 's/.*CONFIG_BIGENDIAN.*/CONFIG_BIGENDIAN=y/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config + else + sed -e 's/.*CONFIG_USER_LITTLEENDIAN.*/CONFIG_USER_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_LITTLEENDIAN.*/CONFIG_LITTLEENDIAN=y/' \ + -e 's/.*CONFIG_ENV_REGION_KERNEL_SWAP.*/CONFIG_ENV_REGION_KERNEL_SWAP=y/' \ + -e 's|CONFIG_ENV_DEFAULT_CMDLINE=|CONFIG_ENV_DEFAULT_CMDLINE=\"${CMDLINE}\"|' \ + ${WORKDIR}/defconfig > ${S}/.config + fi + oe_runmake oldconfig +} + +do_populate_staging() { + install -d ${STAGING_LOADER_DIR} + # FIXME - arch-arm should not be hard-coded + install -m 0755 src/arch-arm/rom/apex.bin ${STAGING_LOADER_DIR}/apex.bin +} diff --git a/packages/apex/nslu2/defconfig b/packages/apex/nslu2/defconfig index 113c69a68e..2d2784457a 100644 --- a/packages/apex/nslu2/defconfig +++ b/packages/apex/nslu2/defconfig @@ -48,7 +48,7 @@ CONFIG_MACH_NSLU2=y # CONFIG_MACH_AVILA2347 is not set # CONFIG_USER_DEFAULTENDIAN is not set # CONFIG_USER_BIGENDIAN is not set -CONFIG_USER_LITTLEENDIAN=y +# CONFIG_USER_LITTLEENDIAN is not set # # Platform Setup @@ -89,8 +89,7 @@ CONFIG_CMD_XRECEIVE=y # # CONFIG_DRIVER_FAT is not set # CONFIG_DRIVER_EXT2 is not set -CONFIG_DRIVER_JFFS2=y -CONFIG_DRIVER_JFFS2_BLOCKDEVICE="nor:0x180000+0x660000" +# CONFIG_DRIVER_JFFS2 is not set CONFIG_DRIVER_FIS=y CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k" CONFIG_DRIVER_NOR_CFI=y @@ -102,21 +101,25 @@ CONFIG_USES_PATHNAME_PARSER=y # Environment # CONFIG_ENV=y +# CONFIG_NO_BOOTSTRAP is not set CONFIG_NOR_BOOT=y # CONFIG_NAND_BOOT is not set +# CONFIG_COMPANION_EVT1_BOOT is not set +# CONFIG_COMPANION_EVT2_BOOT is not set CONFIG_AUTOBOOT=y CONFIG_AUTOBOOT_DELAY=10 CONFIG_ENV_MUTABLE=y CONFIG_ENV_LINK=y CONFIG_ENV_REGION="nor:0x7fc000+15k" +CONFIG_ENV_CHECK_LEN=1024 CONFIG_ENV_STARTUP_KERNEL_COPY=y CONFIG_ENV_REGION_KERNEL="fis://kernel" -CONFIG_ENV_REGION_KERNEL_SWAP=y +# CONFIG_ENV_REGION_KERNEL_SWAP is not set # CONFIG_ENV_STARTUP_RAMDISK_COPY is not set CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE=y CONFIG_ENV_DEFAULT_CMDLINE="console=ttyS0,115200 rootfstype=jffs2 root=/dev/mtdblock4 rw init=/linuxrc noirqdebug" # CONFIG_ENV_DEFAULT_STARTUP_OVERRIDE is not set CONFIG_USES_NOR_BOOTFLASH=y -CONFIG_LITTLEENDIAN=y +# CONFIG_LITTLEENDIAN is not set CONFIG_CLEAR_STACKS=y CONFIG_ALIASES=y -- cgit v1.2.3