diff options
17 files changed, 69 insertions, 63 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index c057d1a05e..79ec27af72 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -50,3 +50,4 @@ DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove thi # We want images supporting the following features (for task-base) DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci" +DISTRO_FEATURES_nslu2le = "nfs smbfs alsa bluetooth ext2 usbhost pci" diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index ba61355ba8..c0401d93d3 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -35,7 +35,7 @@ #DISTRO_TYPE # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.2" +SLUGOS_VERSION = "4.3" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb b/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb index e994e13814..aa7c7cd64c 100644 --- a/packages/arm-kernel-shim/arm-kernel-shim_1.4.11.bb +++ b/packages/arm-kernel-shim/arm-kernel-shim_1.2.bb @@ -3,20 +3,23 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -PR = "r2" +PR = "r1" -SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \ - file://disable-commandline.patch;patch=1 \ +COMPATIBLE_MACHINE = "(ixp4xx|nslu2)" + +SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \ + file://place-boot-section.patch;patch=1 \ file://config-nslu2.h \ file://config-nas100d.h \ file://config-dsmg600.h \ file://config-fsg3.h" -S = ${WORKDIR}/apex-${PV}/arm-kernel-shim +S = ${WORKDIR}/arm-kernel-shim-${PV} EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" oe_runmake() { + mv ${S}/config.h ${S}/config.h.orig # NSLU2 cp ${WORKDIR}/config-nslu2.h ${S}/config.h rm -f ${S}/main.o @@ -37,11 +40,11 @@ oe_runmake() { rm -f ${S}/main.o oenote make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 make ${PARALLEL_MAKE} TOOLS=${CROSS_DIR}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed" + mv ${S}/config.h.orig ${S}/config.h } do_populate_staging() { install -d ${STAGING_LOADER_DIR} - . ${CONFIG_SITE} cp ${S}/arm-kernel-shim-nslu2.bin ${STAGING_LOADER_DIR}/ cp ${S}/arm-kernel-shim-nas100d.bin ${STAGING_LOADER_DIR}/ cp ${S}/arm-kernel-shim-dsmg600.bin ${STAGING_LOADER_DIR}/ diff --git a/packages/arm-kernel-shim/files/config-dsmg600.h b/packages/arm-kernel-shim/files/config-dsmg600.h index b0f37b3e3b..cd331159e0 100644 --- a/packages/arm-kernel-shim/files/config-dsmg600.h +++ b/packages/arm-kernel-shim/files/config-dsmg600.h @@ -14,7 +14,7 @@ #if !defined (__CONFIG_H__) # define __CONFIG_H__ -#define PHYS_PARAMS 0xc0000100 /* Address for the parameter list */ +#define PHYS_PARAMS 0x00000100 /* Address for the parameter list */ #define RAM_BANK0_START 0x00000000 #define RAM_BANK0_LENGTH 0x04000000 diff --git a/packages/arm-kernel-shim/files/config-fsg3.h b/packages/arm-kernel-shim/files/config-fsg3.h index 1222d959c2..e2cdf8abd4 100644 --- a/packages/arm-kernel-shim/files/config-fsg3.h +++ b/packages/arm-kernel-shim/files/config-fsg3.h @@ -14,7 +14,7 @@ #if !defined (__CONFIG_H__) # define __CONFIG_H__ -#define PHYS_PARAMS 0xc0000100 /* Address for the parameter list */ +#define PHYS_PARAMS 0x00000100 /* Address for the parameter list */ #define RAM_BANK0_START 0x00000000 #define RAM_BANK0_LENGTH 0x04000000 diff --git a/packages/arm-kernel-shim/files/config-nas100d.h b/packages/arm-kernel-shim/files/config-nas100d.h index 5f148a666a..4389644cf0 100644 --- a/packages/arm-kernel-shim/files/config-nas100d.h +++ b/packages/arm-kernel-shim/files/config-nas100d.h @@ -14,7 +14,7 @@ #if !defined (__CONFIG_H__) # define __CONFIG_H__ -#define PHYS_PARAMS 0xc0000100 /* Address for the parameter list */ +#define PHYS_PARAMS 0x00000100 /* Address for the parameter list */ #define RAM_BANK0_START 0x00000000 #define RAM_BANK0_LENGTH 0x04000000 @@ -22,8 +22,8 @@ //#define RAM_BANK1_START 0xd0000000 //#define RAM_BANK1_LENGTH 0x10000000 -//#define COMMANDLINE\ -// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs" +#define COMMANDLINE\ + "init=/linuxrc root=/dev/mtdblock2 rootfstype=jffs rw noirqdebug console=ttyS0,115200n8" #define MACH_TYPE 865 diff --git a/packages/arm-kernel-shim/files/config-nslu2.h b/packages/arm-kernel-shim/files/config-nslu2.h index 7547061165..2262b57668 100644 --- a/packages/arm-kernel-shim/files/config-nslu2.h +++ b/packages/arm-kernel-shim/files/config-nslu2.h @@ -14,7 +14,7 @@ #if !defined (__CONFIG_H__) # define __CONFIG_H__ -#define PHYS_PARAMS 0xc0000100 /* Address for the parameter list */ +#define PHYS_PARAMS 0x00000100 /* Address for the parameter list */ #define RAM_BANK0_START 0x00000000 #define RAM_BANK0_LENGTH 0x02000000 @@ -22,8 +22,8 @@ //#define RAM_BANK1_START 0xd0000000 //#define RAM_BANK1_LENGTH 0x10000000 -//#define COMMANDLINE\ -// "console=ttyAMA0 root=/dev/memblk0 rootfstype=jffs" +#define COMMANDLINE\ + "init=/linuxrc root=/dev/mtdblock4 rootfstype=jffs rw noirqdebug console=ttyS0,115200n8" #define MACH_TYPE 597 diff --git a/packages/arm-kernel-shim/files/place-boot-section.patch b/packages/arm-kernel-shim/files/place-boot-section.patch new file mode 100644 index 0000000000..6e6c9460a5 --- /dev/null +++ b/packages/arm-kernel-shim/files/place-boot-section.patch @@ -0,0 +1,12 @@ +--- arm-kernel-shim-1.2/Makefile~ 2007-02-06 16:44:31.000000000 +1030 ++++ arm-kernel-shim-1.2/Makefile 2007-02-06 16:56:12.000000000 +1030 +@@ -9,7 +9,8 @@ + OBJCOPY=$(TOOLS)objcopy + + CFLAGS:=-g -Os -nostartfiles -nostdlib +-LDFLAGS:= -g -X -Map shim.map -Ttext 0 ++# LDFLAGS:= -g -X -Map shim.map -Ttext 0 ++LDFLAGS:= -g -X -Map shim.map -Ttext 0 --section-start .boot=1fb + + SRCS:= shim.lds main.c + OBJS:=$(SRCS:.c=.o) diff --git a/packages/linphone/linphone_1.6.0.bb b/packages/linphone/linphone_1.6.0.bb index 9a5a02f2cd..43b8daa131 100644 --- a/packages/linphone/linphone_1.6.0.bb +++ b/packages/linphone/linphone_1.6.0.bb @@ -18,7 +18,7 @@ RDEPENDS_libmediastreamer = "speex libogg libasound libortp" PROVIDES = "linphone linphonec liblinphone" -PR = "r1" +PR = "r2" SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/linphone-${PV}.tar.gz \ http://download.devbase.at/voip/linphone-1.6.0-pl0.patch;patch=1" @@ -27,8 +27,7 @@ S = "${WORKDIR}/linphone-${PV}" inherit autotools pkgconfig -#ugly, ugly hack to get around some pkgconfig versioning problems, hopefully the nslu2 people will come up with a proper solution -export PKG_CONFIG=/usr/bin/pkg-config +export PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config EXTRA_OECONF = "--disable-gtk-doc \ --without-ffmpeg --disable-video --without-sdl \ diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc index 3a80703420..d2cb649437 100644 --- a/packages/linux/ixp4xx-kernel.inc +++ b/packages/linux/ixp4xx-kernel.inc @@ -26,6 +26,8 @@ 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 @@ -316,18 +318,20 @@ pkg_postrm_kernel () { # copy the zImage and append the appropriate shim # dest: where to copy to # cmdline: command line to pass to image -# machine-id: decimal machine id to prepend, empty for none +# machine: machine shim to prepend, empty for none copy_image() { - local setmach + local shim - setmach="" - test -n "$2" && setmach="wb $2 . 256/ 255& 0xe3a01c00+, 4; wb 255& 0xe3811000+, 4;" + shim="/dev/null" + test -n "$2" && shim="${STAGING_LOADER_DIR}/arm-kernel-shim-$2.bin" - rm -f "$1".new - devio '<<${KERNEL_OUTPUT}' >"$1".new "$setmach"'${FIXUP}' || { + rm -f "$1".new "$1".shim + cat $shim ${KERNEL_OUTPUT} > "$1".shim + devio '<<'"$1"'.shim' >"$1".new '${FIXUP}' || { echo 'ERROR: ${KERNEL_OUTPUT}: failed to copy zImage' >&2 return 1 } + rm -f "$1".shim mv "$1".new "$1" } @@ -342,10 +346,10 @@ do_install_append() { install_image '${MACHINE_ARCH}' # Add the machine specific images, with appropriate suffixes - 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}' + install_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2' + install_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d' + install_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600' + install_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3' } do_deploy[dirs] = "${S}" @@ -359,10 +363,10 @@ do_deploy() { deploy_image '${MACHINE_ARCH}' # And the machine specific images - 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}' + deploy_image 'nslu2${SITEINFO_ENDIANESS}' 'nslu2' + deploy_image 'nas100d${SITEINFO_ENDIANESS}' 'nas100d' + deploy_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600' + deploy_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3' } addtask deploy before do_build after do_compile diff --git a/packages/linux/ixp4xx-kernel/2.6.19/series b/packages/linux/ixp4xx-kernel/2.6.19/series index ec0e7a81c5..df62b582e7 100644 --- a/packages/linux/ixp4xx-kernel/2.6.19/series +++ b/packages/linux/ixp4xx-kernel/2.6.19/series @@ -39,8 +39,9 @@ squashfs/squashfs-Makefile.patch 86-nas100d-rtc-fixup.patch 87-dsmg600-rtc-fixup.patch 88-dsmg600-dflt-cmdline.patch -88-nas100d-dflt-cmdline.patch -88-nslu2-dflt-cmdline.patch +# These are now done via arm-kernel-shim +#88-nas100d-dflt-cmdline.patch +#88-nslu2-dflt-cmdline.patch 95-pata-ixp4xx.patch 96-fsg3-support.patch 97-avila-setup-pata.patch diff --git a/packages/linux/ixp4xx-kernel/2.6.20/series b/packages/linux/ixp4xx-kernel/2.6.20/series index f362b614b4..d98b4ba58f 100644 --- a/packages/linux/ixp4xx-kernel/2.6.20/series +++ b/packages/linux/ixp4xx-kernel/2.6.20/series @@ -35,8 +35,9 @@ squashfs/squashfs-Makefile.patch 86-nas100d-rtc-fixup.patch 87-dsmg600-rtc-fixup.patch 88-dsmg600-dflt-cmdline.patch -88-nas100d-dflt-cmdline.patch -88-nslu2-dflt-cmdline.patch +# These are now done via arm-kernel-shim +#88-nas100d-dflt-cmdline.patch +#88-nslu2-dflt-cmdline.patch 96-fsg3-support.patch 98-sata_via-pata-support-upstream.patch 99-avila-mtd-microcode.patch diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb index 6841c93d00..915e241f75 100644 --- a/packages/linux/ixp4xx-kernel_2.6.19.bb +++ b/packages/linux/ixp4xx-kernel_2.6.19.bb @@ -23,16 +23,3 @@ require ixp4xx-kernel-svnpatch.inc SRC_URI += "file://defconfig" SRC_URI += "file://series" - -# Remove the specific cmdline hacking patches if we are not building for nslu2. -addtask remove_cmdline_hacks before do_patch after do_unpack -do_remove_cmdline_hacks() { - -# if [ "${MACHINE}" != "nslu2" ] ; then - sed -e '/88-nas100d-dflt-cmdline.patch/d' \ - -e '/88-nslu2-dflt-cmdline.patch/d' \ - '${WORKDIR}/series' > '${WORKDIR}/series.new' - mv '${WORKDIR}/series.new' '${WORKDIR}/series' -# fi - -} diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb index 0cc6b387f7..304866c555 100644 --- a/packages/linux/ixp4xx-kernel_2.6.20.bb +++ b/packages/linux/ixp4xx-kernel_2.6.20.bb @@ -23,16 +23,3 @@ require ixp4xx-kernel-svnpatch.inc SRC_URI += "file://defconfig" SRC_URI += "file://series" - -# Remove the specific cmdline hacking patches if we are not building for nslu2. -addtask remove_cmdline_hacks before do_patch after do_unpack -do_remove_cmdline_hacks() { - - if [ "${MACHINE}" != "nslu2" ] ; then - sed -e '/88-nas100d-dflt-cmdline.patch/d' \ - -e '/88-nslu2-dflt-cmdline.patch/d' \ - '${WORKDIR}/series' > '${WORKDIR}/series.new' - mv '${WORKDIR}/series.new' '${WORKDIR}/series' - fi - -} diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh7.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh10.bb index b34d4630a0..ec5844bfb5 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.19-hh7.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh10.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r0" +PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/packages/linux/linux-handhelds-2.6_2.6.19-hh9.bb b/packages/linux/linux-handhelds-2.6_2.6.19-hh9.bb new file mode 100644 index 0000000000..ec5844bfb5 --- /dev/null +++ b/packages/linux/linux-handhelds-2.6_2.6.19-hh9.bb @@ -0,0 +1,11 @@ +SECTION = "kernel" +DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." +LICENSE = "GPL" +PR = "r1" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \ + file://defconfig" + +require linux-handhelds-2.6.inc diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb index e004199865..bdb091ba9b 100644 --- a/packages/linux/linux-handhelds-2.6_cvs.bb +++ b/packages/linux/linux-handhelds-2.6_cvs.bb @@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1" K_MAJOR = "2" K_MINOR = "6" K_MICRO = "19" -HHV = "7" +HHV = "10" SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26 \ file://defconfig" |