diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-04-27 22:26:57 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-04-27 22:26:57 +0000 |
| commit | 784dfc69797f25aed4f0079b4b9df0c1a3c74720 (patch) | |
| tree | f0be7aaff6dc37838e031f8880a6a32093e97581 | |
| parent | d0b1a237477786a0fcd292513a8cf855de16bc7a (diff) | |
| parent | 3d572b55dab462c7767044e03417b0f522a445a3 (diff) | |
merge of '38838ab61d84fb4ed9c36e21484735a9eca09c9c'
and '9febc982a33100b03781aa11d0b9064c71b21683'
| -rw-r--r-- | conf/machine/at32stk1000.conf | 3 | ||||
| -rw-r--r-- | packages/images/unslung-image.bb | 8 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 5 | ||||
| -rw-r--r-- | packages/openocd/openocd_svn.bb | 3 |
4 files changed, 15 insertions, 4 deletions
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 15e3c85ec5..13523ee1e5 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -22,8 +22,9 @@ ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "1.1.4" +PREFERRED_VERSION_u-boot = "1.3.2" +UBOOT_MACHINE = "atstk1002_config" UBOOT_ENTRYPOINT = "0x90000000" UBOOT_LOADADDRESS = "0x10000000" diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index cb2a20b75e..9ac4140a14 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -100,4 +100,12 @@ nslu2_pack_image () { -m ${STAGING_FIRMWARE_DIR}/NPE-B \ -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin + slugimage -F -p \ + -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ + -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \ + -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -m ${STAGING_FIRMWARE_DIR}/NPE-B \ + -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin } diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 5401237c49..526f49bd13 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r50" +PR = "r51" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -176,6 +176,7 @@ SLUGOS_PACKAGES = "\ openobex-apps \ openntpd \ openobex \ + openocd \ openssh \ openvpn \ patch \ @@ -216,6 +217,7 @@ SLUGOS_PACKAGES = "\ sudo \ sysfsutils \ tar \ + task-mokogateway-everything \ tcpdump \ thttpd \ tiff \ @@ -262,7 +264,6 @@ SLUGOS_BROKEN_PACKAGES = "\ pwc \ qc-usb-messenger \ syslog-ng \ - openocd task-mokogateway-everything \ task-native-sdk \ unionfs-modules unionfs-utils \ wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \ diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index 2815324521..d5c5ba05cd 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Bounda HOMEPAGE = "http://openocd.berlios.de/" LICENSE = "GPL" PV = "0.0+r${SRCREV}" -PR = "r1" +PR = "r2" inherit autotools @@ -10,4 +10,5 @@ SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \ file://openocd-link-static.patch;patch=1" S = "${WORKDIR}/trunk" +DEPENDS = "libftdi" EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx" |