diff options
| -rw-r--r-- | packages/apex/apex_1.4.5.bb | 46 | ||||
| -rw-r--r-- | packages/apex/nslu2/defconfig | 62 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel-svnpatch.inc | 6 | ||||
| -rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.18.bb | 2 |
4 files changed, 99 insertions, 17 deletions
diff --git a/packages/apex/apex_1.4.5.bb b/packages/apex/apex_1.4.5.bb new file mode 100644 index 0000000000..97e20ec271 --- /dev/null +++ b/packages/apex/apex_1.4.5.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "APEX Boot Loader" +SECTION = "" +PRIORITY = "optional" +MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" +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/nslu2/defconfig b/packages/apex/nslu2/defconfig index 138ed749a4..113c69a68e 100644 --- a/packages/apex/nslu2/defconfig +++ b/packages/apex/nslu2/defconfig @@ -1,27 +1,41 @@ # # Automatically generated make config: don't edit # Linux kernel version: -# Tue May 17 09:42:40 2005 +# Fri Aug 18 09:47:40 2006 # CONFIG_ARM=y +CONFIG_CPU_ARMV5=y +CONFIG_CPU_XSCALE=y # CONFIG_ARCH_LH7952X is not set # CONFIG_ARCH_LH7A40X is not set CONFIG_ARCH_IXP42X=y -# CONFIG_EXPERIMENTAL is not set +# CONFIG_ARCH_S3C2410 is not set +CONFIG_EXPERIMENTAL=y +# CONFIG_SMALL is not set # # General Setup # -CONFIG_CROSS_COMPILE="/usr/armv5b-softfloat-linux/gcc-3.4.2-glibc-2.3.3/bin/armv5b-softfloat-linux-" -# CONFIG_SMALL is not set +CONFIG_CROSS_COMPILE="" +CONFIG_CC_OPTIMIZE_FOR_SIZE=y +# CONFIG_CC_OPTIMIZE_FOR_SPEED is not set +# CONFIG_CC_NO_OPTIMIZATION is not set +CONFIG_STARTUP_UART=y # CONFIG_DEBUG_LL is not set CONFIG_SPINNER=y CONFIG_ATAG=y +CONFIG_MMU=y +# CONFIG_FORCE_WRITETHROUGH_DCACHE is not set CONFIG_DISABLE_MMU_AT_BOOT=y +# CONFIG_INTERRUPTS is not set +CONFIG_SDRAMBOOT_REPORT=y +CONFIG_STACK_SIZE=0x1000 +CONFIG_STACKLIMIT=y CONFIG_ATAG_PHYS=0x00000100 CONFIG_ARCH_NUMBER=597 CONFIG_APEX_VMA=0x00200000 CONFIG_KERNEL_LMA=0x00008000 +# CONFIG_USE_RAMDISK is not set CONFIG_SDRAM_BANK0=y # CONFIG_SDRAM_BANK1 is not set CONFIG_NOR_BUSWIDTH=16 @@ -32,19 +46,27 @@ CONFIG_ENV_STARTUP="" CONFIG_MACH="ixp42x" 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 # # Platform Setup # -CONFIG_USE_RAMDISK=y -CONFIG_RAMDISK_LMA=0x01000000 CONFIG_SDRAM_BANK_LENGTH=0x02000000 +# CONFIG_DISABLE_SECOND_UART_INIT is not set CONFIG_ARCH_IXP420=y # # Commands # CONFIG_ALLHELP=y +CONFIG_ALPHABETIZE_COMMANDS=y +CONFIG_DEL_IS_BS=y +CONFIG_ANSI_KEYS=y +CONFIG_COMMAND_HISTORY=y +CONFIG_COMMAND_EDITING=y +CONFIG_CMD_ALIAS=y CONFIG_CMD_CHECKSUM=y CONFIG_CMD_COPY=y CONFIG_CMD_COMPARE=y @@ -55,34 +77,46 @@ CONFIG_CMD_ENV=y CONFIG_CMD_SETENV=y CONFIG_CMD_ERASE=y CONFIG_CMD_FILL=y -CONFIG_CMD_INFO=y CONFIG_CMD_GO=y +CONFIG_CMD_INFO=y # CONFIG_CMD_PAUSE is not set CONFIG_CMD_WAIT=y CONFIG_CMD_XRECEIVE=y +# CONFIG_CMD_MEMLIMIT is not set # # Generic Drivers # # CONFIG_DRIVER_FAT is not set # CONFIG_DRIVER_EXT2 is not set -# CONFIG_DRIVER_JFFS2 is not set +CONFIG_DRIVER_JFFS2=y +CONFIG_DRIVER_JFFS2_BLOCKDEVICE="nor:0x180000+0x660000" +CONFIG_DRIVER_FIS=y +CONFIG_DRIVER_FIS_BLOCKDEVICE="nor:0x7e0000+4k" CONFIG_DRIVER_NOR_CFI=y +# CONFIG_DRIVER_NOR_CFI_NO_BUFFERED is not set CONFIG_USES_NOR_CFI=y +CONFIG_USES_PATHNAME_PARSER=y # # Environment # +CONFIG_ENV=y CONFIG_NOR_BOOT=y # CONFIG_NAND_BOOT is not set CONFIG_AUTOBOOT=y CONFIG_AUTOBOOT_DELAY=10 CONFIG_ENV_MUTABLE=y -CONFIG_ENV_REGION="nor:128k+64k" +CONFIG_ENV_LINK=y +CONFIG_ENV_REGION="nor:0x7fc000+15k" CONFIG_ENV_STARTUP_KERNEL_COPY=y -CONFIG_ENV_REGION_KERNEL="nor:0x60010+0xffff0" -CONFIG_ENV_STARTUP_RAMDISK_COPY=y -CONFIG_ENV_REGION_RAMDISK="nor:0x160010+0x69fff0" -# CONFIG_ENV_DEFAULT_CMDLINE_OVERRIDE is not set +CONFIG_ENV_REGION_KERNEL="fis://kernel" +CONFIG_ENV_REGION_KERNEL_SWAP=y +# 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_BIGENDIAN=y +CONFIG_LITTLEENDIAN=y +CONFIG_CLEAR_STACKS=y +CONFIG_ALIASES=y diff --git a/packages/linux/ixp4xx-kernel-svnpatch.inc b/packages/linux/ixp4xx-kernel-svnpatch.inc index 3acd06d3ac..573888f30a 100644 --- a/packages/linux/ixp4xx-kernel-svnpatch.inc +++ b/packages/linux/ixp4xx-kernel-svnpatch.inc @@ -1,10 +1,12 @@ addtask svnpatch before do_configure after do_patch +IXP4XX_KERNEL_SVN_REPO ?= http://svn.nslu2-linux.org/svnroot/kernel/trunk + do_svnpatch() { - svn co http://svn.nslu2-linux.org/svnroot/kernel/trunk/patches/${PV} --revision ${IXP4XX_KERNEL_SVN_REV} ${WORKDIR}/patches-${PV} + svn co ${IXP4XX_KERNEL_SVN_REPO}/patches/${PV} --revision ${IXP4XX_KERNEL_SVN_REV} ${WORKDIR}/patches-${PV} cp ${WORKDIR}/patches-${PV}/defconfig ${WORKDIR}/defconfig rm -rf ${S}/patches - cd ${S} && ln -s ${WORKDIR}/patches-${PV} ${S}/patches + cd ${S} && ln -s ${WORKDIR}/patches-${PV} ${S}/patches cd ${S} && ${STAGING_BINDIR}/quilt push -av } diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb index 12f608bf03..b9ca8b44c9 100644 --- a/packages/linux/ixp4xx-kernel_2.6.18.bb +++ b/packages/linux/ixp4xx-kernel_2.6.18.bb @@ -6,7 +6,7 @@ # http://trac.nslu2-linux.org/kernel/ # # The revision that is pulled from SVN is specified below -IXP4XX_KERNEL_SVN_REV = "416" +IXP4XX_KERNEL_SVN_REV = "421" # # Increment the number below (i.e. the digits after PR) when # the changes in SVN between revisions include changes in the |