diff options
Diffstat (limited to 'packages')
34 files changed, 2503 insertions, 163 deletions
diff --git a/packages/meta/meta-sdk-gpe.bb b/packages/meta/meta-sdk-gpe.bb new file mode 100644 index 0000000000..5dd6b5cc0c --- /dev/null +++ b/packages/meta/meta-sdk-gpe.bb @@ -0,0 +1,101 @@ +DESCRIPTION = "Meta package for SDK including GPE" +LICENSE = "MIT" +DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" +PR = "r0" + +inherit sdk meta + +SDK_DIR = "${WORKDIR}/sdk" +SDK_OUTPUT = "${SDK_DIR}/image" +SDK_DEPLOY = "${TMPDIR}/deploy/sdk" + +IPKG_HOST = "ipkg-cl -f ${SDK_DIR}/ipkg-host.conf -o ${SDK_OUTPUT}" +IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" + +HOST_INSTALL = "\ + binutils-cross-sdk \ + gcc-cross-sdk \ + gdb-cross" + +TARGET_INSTALL = "\ + task-sdk-base \ + task-sdk-x11 \ + task-sdk-x11-ext \ + task-sdk-gpe \ + task-sdk-gpephone" + +RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}" + +do_populate_sdk() { + touch ${DEPLOY_DIR_IPK}/Packages + ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK} + + rm -rf ${SDK_OUTPUT} + mkdir -p ${SDK_OUTPUT} + + cat <<EOF >${SDK_DIR}/ipkg-host.conf +src oe file:${DEPLOY_DIR_IPK} +arch ${BUILD_ARCH} 1 +EOF + cat <<EOF >${SDK_DIR}/ipkg-target.conf +src oe file:${DEPLOY_DIR_IPK} +EOF + ipkgarchs="${PACKAGE_ARCHS}" + priority=1 + for arch in $ipkgarchs; do + echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf + priority=$(expr $priority + 5) + done + + rm -r ${SDK_OUTPUT} + mkdir -p ${SDK_OUTPUT} + + ${IPKG_HOST} update + ${IPKG_HOST} -nodeps install ${HOST_INSTALL} + + ${IPKG_TARGET} update + ${IPKG_TARGET} install ${TARGET_INSTALL} + + mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} + cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} + rm -rf ${SDK_OUTPUT}/${prefix}/usr/ + + cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib + rm -rf ${SDK_OUTPUT}/${prefix}/lib/* + + mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib + + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + chmod -R a+r ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ + find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ -type d | xargs chmod +x + + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so + # remove unwanted housekeeping files + mv ${SDK_OUTPUT}${libdir}/../${TARGET_ARCH}-${TARGET_OS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + rm -rf ${SDK_OUTPUT}${libdir}/ipkg + + # remove unwanted executables + rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc + + # remove broken .la files + rm ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/*.la + + # fix pkgconfig data files + cd ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/pkgconfig + for f in *.pc ; do + sed -i 's%=/usr%=${prefix}/${TARGET_ARCH}-${TARGET_OS}%g' "$f" + done + for f in *.pc ; do + sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f" + done + + mkdir -p ${SDK_DEPLOY} + cd ${SDK_OUTPUT} + fakeroot tar cfj ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-oe-sdk-${DATE}.tar.bz2 . +} + +do_populate_sdk[nostamp] = "1" +do_populate_sdk[recrdeptask] = "do_package_write" +addtask populate_sdk before do_build after do_install diff --git a/packages/meta/meta-sdk-sbox-gpe.bb b/packages/meta/meta-sdk-sbox-gpe.bb new file mode 100644 index 0000000000..a66989b3aa --- /dev/null +++ b/packages/meta/meta-sdk-sbox-gpe.bb @@ -0,0 +1,101 @@ +DESCRIPTION = "Meta package for a Scratchbox GPE SDK" +LICENSE = "MIT" +PACKAGES = "" +PR = "r0" + +inherit rootfs_ipk sdk meta + +SDK_DIR = "${WORKDIR}/sdk" +SDK_OUTPUT = "${SDK_DIR}/image" +SDK_DEPLOY = "${DEPLOY_DIR}/sdk" +prefix = "/" +exec_prefix = "${prefix}" +base_prefix = "${exec_prefix}" +FILES_${PN} = "${prefix}" + +TARGET_INSTALL = "\ + task-sdk-base \ + task-sdk-sbox \ + task-sdk-sbox-gpe \ + task-sdk-x11 \ + task-sdk-x11-ext \ + task-sdk-gpe \ + task-sdk-gpephone" + +DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" +RDEPENDS = "${TARGET_INSTALL}" + + +IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}" + +do_populate_sdk() { + + set -ex + rootfs_ipk_do_indexes + set +ex + + rm -rf ${SDK_OUTPUT} + mkdir -p ${SDK_OUTPUT} + + cat <<EOF >${SDK_DIR}/ipkg-target.conf +src oe file:${DEPLOY_DIR_IPK} +EOF + ipkgarchs="${PACKAGE_ARCHS}" + priority=1 + for arch in $ipkgarchs; do + echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf + priority=$(expr $priority + 5) + if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then + echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf + fi + done + + rm -r ${SDK_OUTPUT} + mkdir -p ${SDK_OUTPUT} + + ${IPKG_TARGET} update + ${IPKG_TARGET} install ${TARGET_INSTALL} + + mkdir -p ${SDK_OUTPUT}/${prefix}/usr/include + #cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} + #rm -rf ${SDK_OUTPUT}/${prefix}/usr/ + + #cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib + #rm -rf ${SDK_OUTPUT}/${prefix}/lib/* + + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/usr/include/ + cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/usr/include/ + chmod -R a+r ${SDK_OUTPUT}/${prefix}/usr/include/ + find ${SDK_OUTPUT}/${prefix}/usr/include/ -type d | xargs chmod +x + + echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libpthread.so + echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/lib/libc.so + # remove unwanted housekeeping files + mv ${SDK_OUTPUT}${libdir}/../*/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + rm -rf ${SDK_OUTPUT}${libdir}/ipkg + + # remove unwanted executables + rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc + + # fixup libtool files + rm ${SDK_OUTPUT}/${prefix}/usr/lib/*.la + #cd ${SDK_OUTPUT}/${prefix}/usr/lib/ + #for f in *.la ; do + # sed -i 's%${STAGING_DIR}/${TARGET_SYS}%/usr/%g' "$f" + #done + + + # fix pkgconfig data files + cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig + for f in *.pc ; do + sed -i 's%${STAGING_DIR}%/usr/%g' "$f" + done + + mkdir -p ${SDK_DEPLOY} + cd ${SDK_OUTPUT} + fakeroot tar cfz ${SDK_DEPLOY}/${DISTRO}-${DISTRO_VERSION}-${TARGET_ARCH}-sbox-sdk-${DATE}.tar.gz . +} + +do_populate_sdk[nostamp] = "1" +do_populate_sdk[recrdeptask] = "do_package_write" +addtask populate_sdk before do_build after do_install diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb index 1e96e76d5a..c0cb27d404 100644 --- a/packages/meta/meta-sdk-sbox.bb +++ b/packages/meta/meta-sdk-sbox.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Meta package for a Scratchbox SDK" LICENSE = "MIT" PACKAGES = "" -PR = "r5" +PR = "r6" inherit rootfs_ipk sdk meta @@ -14,7 +14,7 @@ base_prefix = "${exec_prefix}" FILES_${PN} = "${prefix}" TARGET_INSTALL = "\ - task-sdk-base \ + task-sdk-bare \ task-sdk-sbox \ " @@ -74,11 +74,12 @@ EOF rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc # fixup libtool files - cd ${SDK_OUTPUT}/${prefix}/lib/ - for f in *.la ; do - sed -i 's%${STAGING_DIR}${TARGET_SYS}%/usr/%g' "$f" - done - + rm ${SDK_OUTPUT}/${prefix}/usr/lib/*.la + #cd ${SDK_OUTPUT}/${prefix}/usr/lib/ + #for f in *.la ; do + # sed -i 's%${STAGING_DIR}/${TARGET_SYS}%/usr/%g' "$f" + #done + # fix pkgconfig data files cd ${SDK_OUTPUT}/${prefix}/usr/lib/pkgconfig diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb index 86bb212214..e793c08de0 100644 --- a/packages/meta/meta-sdk.bb +++ b/packages/meta/meta-sdk.bb @@ -1,7 +1,7 @@ -DESCRIPTION = "Meta package for SDK including GPE and Opie" +DESCRIPTION = "Meta package for bare SDK package" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" -PR = "r12" +PR = "r13" inherit sdk meta @@ -18,7 +18,7 @@ HOST_INSTALL = "\ gdb-cross" TARGET_INSTALL = "\ - task-sdk-base \ + task-sdk-bare \ " RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}" diff --git a/packages/tasks/task-sdk-base.bb b/packages/tasks/task-sdk-base.bb new file mode 100644 index 0000000000..3bf708902f --- /dev/null +++ b/packages/tasks/task-sdk-base.bb @@ -0,0 +1,53 @@ +DESCRIPTION = "Basic SDK development packages" +PR = "r0" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +DEPENDS = "task-sdk" + +RDEPENDS := "\ + task-sdk-bare \ + glibc \ + glibc-dev \ + libgcc1 \ + alsa-dev \ + audiofile-dev \ + bluez-libs-dev \ + dbus-dev \ + expat-dev \ + fontconfig-dev \ + freetype-dev \ + glib-2.0-dev \ + gstreamer-dev \ + libice-dev \ + ipkg-dev \ + jpeg-dev \ + libapm-dev \ + alsa-lib-dev \ + libdisplaymigration-dev \ + libetpan-dev \ + libgcrypt-dev \ + libglade-dev \ + gnutls-dev \ + libgpg-error-dev \ + libidl-dev \ + libiw-dev \ + libmimedir-dev \ + libpcap-dev \ + libpixman-dev \ + libpng-dev \ + libschedule-dev \ + libsm-dev \ + libsoundgen-dev \ + libsoup-dev \ + libsvg-dev \ + libtododb-dev \ + libts-dev \ + libxml2-dev \ + ncurses-dev \ + openobex-dev \ + popt-dev \ + readline-dev \ + libsqlite-dev \ + zlib-dev \ + libxmu-dev" diff --git a/packages/tasks/task-sdk-sbox-gpe.bb b/packages/tasks/task-sdk-sbox-gpe.bb new file mode 100644 index 0000000000..77950dfb01 --- /dev/null +++ b/packages/tasks/task-sdk-sbox-gpe.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits" +PR = "r0" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS := "\ + glib-2.0-utils \ + gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-jpeg \ + gdk-pixbuf-loader-gif \ + gdk-pixbuf-loader-xpm \ + intltool \ + intltool-dev \ + ipkg \ + ipkg-utils \ + gettext-dev \ + pkgconfig-dev \ + autoconf \ + automake \ + " diff --git a/packages/tasks/task-sdk-sbox.bb b/packages/tasks/task-sdk-sbox.bb index 3b1051f570..aa8dddfbd8 100644 --- a/packages/tasks/task-sdk-sbox.bb +++ b/packages/tasks/task-sdk-sbox.bb @@ -1,5 +1,5 @@ -DESCRIPTION = "SDK task for Scratchbox rootstraps" -PR = "r5" +DESCRIPTION = "SDK task for Scratchbox rootstraps incuding GPE/GTK bits" +PR = "r6" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -9,4 +9,5 @@ RDEPENDS := "\ sbrsh \ fakeroot \ ipkg \ + ipkg-utils \ " diff --git a/packages/tasks/task-sdk.bb b/packages/tasks/task-sdk.bb index ab64de941c..6e6770c913 100644 --- a/packages/tasks/task-sdk.bb +++ b/packages/tasks/task-sdk.bb @@ -5,19 +5,10 @@ ALLOW_EMPTY = "1" PACKAGES = "\ task-sdk-bare \ - task-sdk-base \ " RDEPENDS_task-sdk-bare := "\ glibc \ glibc-dev \ libgcc1 \ - " - -RDEPENDS_task-sdk-base := "\ - glibc \ - glibc-dev \ - libgcc1 \ - ipkg-dev \ - " - + "
\ No newline at end of file diff --git a/packages/uboot-utils/files/fw_env.h.patch b/packages/uboot-utils/files/fw_env.h.patch deleted file mode 100644 index 2ef2bb83c4..0000000000 --- a/packages/uboot-utils/files/fw_env.h.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- u-boot-1.1.2.orig/tools/env/fw_env.h 2003-06-27 14:32:49.000000000 -0700 -+++ u-boot-1.1.2/tools/env/fw_env.h 2006-11-16 10:51:01.000000000 -0800 -@@ -27,14 +27,15 @@ - * See included "fw_env.config" sample file (TRAB board) - * for notes on configuration. - */ --#define CONFIG_FILE "/etc/fw_env.config" - --#define HAVE_REDUND /* For systems with 2 env sectors */ --#define DEVICE1_NAME "/dev/mtd1" -+/* #define CONFIG_FILE "/etc/fw_env.config" */ -+ -+#undef HAVE_REDUND /* For systems with 2 env sectors */ -+#define DEVICE1_NAME "/dev/mtd/3" - #define DEVICE2_NAME "/dev/mtd2" --#define DEVICE1_OFFSET 0x0000 --#define ENV1_SIZE 0x4000 --#define DEVICE1_ESIZE 0x4000 -+#define DEVICE1_OFFSET 0x30000 -+#define ENV1_SIZE 0x10000 -+#define DEVICE1_ESIZE 0x10000 - #define DEVICE2_OFFSET 0x0000 - #define ENV2_SIZE 0x4000 - #define DEVICE2_ESIZE 0x4000 diff --git a/packages/uboot-utils/files/turbostation/.mtn2git_empty b/packages/uboot-utils/files/turbostation/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/uboot-utils/files/turbostation/.mtn2git_empty +++ /dev/null diff --git a/packages/uboot-utils/uboot-utils_1.1.2.bb b/packages/uboot-utils/uboot-utils_1.1.2.bb deleted file mode 100644 index 621a55c964..0000000000 --- a/packages/uboot-utils/uboot-utils_1.1.2.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "U-boot bootloader OS env. access tools for PPC" -SECTION = "bootloaders" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "mtd-utils" -PR = "r4" - -SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \ - file://fw_env.c.patch;patch=1 \ - file://tools-Makefile.patch;patch=1 \ - file://env-Makefile.patch;patch=1 \ - file://fw_env.config" - -S = "${WORKDIR}/u-boot-${PV}" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" -TARGET_LDFLAGS = "" - -UBOOT_MACHINE ?= "${MACHINE}_config" - -inherit base - -do_configure() { - : -} - -do_compile () { - oe_runmake Sandpoint8240_config - oe_runmake tools -} - -# install mkimage for the kernel makefile -do_stage() { - install -d ${STAGING_BINDIR_NATIVE} - install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/ -} - -do_install () { - install -d ${D}/sbin - install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config - install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv - install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv -} diff --git a/packages/uboot-utils/.mtn2git_empty b/packages/uboot/u-boot-1.2.0/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot-utils/.mtn2git_empty +++ b/packages/uboot/u-boot-1.2.0/.mtn2git_empty diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd b/packages/uboot/u-boot-1.2.0/defconfig_lsppchd index 5919f5eb2c..5919f5eb2c 100644 --- a/packages/uboot/u-boot-linkstationppc/defconfig_lsppchd +++ b/packages/uboot/u-boot-1.2.0/defconfig_lsppchd diff --git a/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg b/packages/uboot/u-boot-1.2.0/defconfig_lsppchg index b9943b4c76..b9943b4c76 100644 --- a/packages/uboot/u-boot-linkstationppc/defconfig_lsppchg +++ b/packages/uboot/u-boot-1.2.0/defconfig_lsppchg diff --git a/packages/uboot-utils/files/env-Makefile.patch b/packages/uboot/u-boot-1.2.0/env-Makefile.patch index ad3a6b39a3..ad3a6b39a3 100644 --- a/packages/uboot-utils/files/env-Makefile.patch +++ b/packages/uboot/u-boot-1.2.0/env-Makefile.patch diff --git a/packages/uboot-utils/files/.mtn2git_empty b/packages/uboot/u-boot-1.2.0/fic-gta01/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/uboot-utils/files/.mtn2git_empty +++ b/packages/uboot/u-boot-1.2.0/fic-gta01/.mtn2git_empty diff --git a/packages/uboot-utils/files/fic-gta01/fw_env.config b/packages/uboot/u-boot-1.2.0/fic-gta01/fw_env.config index 9fe07672c5..9fe07672c5 100644 --- a/packages/uboot-utils/files/fic-gta01/fw_env.config +++ b/packages/uboot/u-boot-1.2.0/fic-gta01/fw_env.config diff --git a/packages/uboot-utils/files/fw_env.c.patch b/packages/uboot/u-boot-1.2.0/fw_env.c.patch index 62f364ad4a..62f364ad4a 100644 --- a/packages/uboot-utils/files/fw_env.c.patch +++ b/packages/uboot/u-boot-1.2.0/fw_env.c.patch diff --git a/packages/uboot-utils/files/fw_env.config b/packages/uboot/u-boot-1.2.0/fw_env.config index 2432bd866c..2432bd866c 100644 --- a/packages/uboot-utils/files/fw_env.config +++ b/packages/uboot/u-boot-1.2.0/fw_env.config diff --git a/packages/uboot/u-boot-linkstationppc/kurobox_powerpc-20061105_target.gitdiff b/packages/uboot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff index 02027b1062..02027b1062 100644 --- a/packages/uboot/u-boot-linkstationppc/kurobox_powerpc-20061105_target.gitdiff +++ b/packages/uboot/u-boot-1.2.0/kurobox_powerpc-20061105_target.gitdiff diff --git a/packages/uboot/u-boot-1.2.0/qnap.diff b/packages/uboot/u-boot-1.2.0/qnap.diff new file mode 100644 index 0000000000..b9ac34e6a8 --- /dev/null +++ b/packages/uboot/u-boot-1.2.0/qnap.diff @@ -0,0 +1,1089 @@ +--- u-boot-1.2.0.vanilla/board/qnap/config.mk 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot-1.2.0/board/qnap/config.mk 2007-02-26 01:55:37.000000000 +0100 +@@ -0,0 +1,35 @@ ++# ++# (C) Copyright 2000, 2001 ++# Wolfgang Denk, DENX Software Engineering, wd@denx.de. ++# ++# See file CREDITS for list of people who contributed to this ++# project. ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++# Valid values for TEXT_BASE are: ++# ++# Standard configuration ++# 0xFFF00000 boot from flash ++# ++# Standard configuration ++# 0xFFF60000 chain boot from flash ++# ++ ++ ++TEXT_BASE = 0xFFF60000 ++ ++PLATFORM_CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) +--- u-boot-1.2.0.vanilla/board/qnap/ide.c 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot-1.2.0/board/qnap/ide.c 2007-02-26 01:55:37.000000000 +0100 +@@ -0,0 +1,67 @@ ++/* ++ * (C) Copyright 2000 ++ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++ #include <common.h> ++ ++#ifdef CFG_CMD_IDE ++#include <ata.h> ++#include <ide.h> ++#include <pci.h> ++ ++extern ulong ide_bus_offset[CFG_IDE_MAXBUS]; ++extern struct pci_controller hose; ++ ++int ide_preinit (void) ++{ ++ int status; ++ pci_dev_t devbusfn; ++ int l; ++ ++ status = 1; ++ for (l = 0; l < CFG_IDE_MAXBUS; l++) { ++ ide_bus_offset[l] = -ATA_STATUS; ++ } ++ devbusfn = pci_find_device (0x1095, 0x3512, 0); ++ ++ if (devbusfn != -1) { ++ ++ status = 0; ++ ++ pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0, ++ (u32 *) &ide_bus_offset[0]); ++ ide_bus_offset[0] &= 0xfffffffe; ++ ide_bus_offset[0] = pci_hose_bus_to_phys(&hose, ++ ide_bus_offset[0] & 0xfffffffe, ++ PCI_REGION_IO); ++ ++ pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_2, ++ (u32 *) &ide_bus_offset[1]); ++ ide_bus_offset[1] &= 0xfffffffe; ++ ide_bus_offset[1] = pci_hose_bus_to_phys(&hose, ++ ide_bus_offset[1] & 0xfffffffe, ++ PCI_REGION_IO); ++ } ++ return (status); ++} ++ ++#endif /* of CONFIG_CMDS_IDE */ +--- u-boot-1.2.0.vanilla/board/qnap/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot-1.2.0/board/qnap/Makefile 2007-02-26 01:55:37.000000000 +0100 +@@ -0,0 +1,40 @@ ++# ++# (C) Copyright 2000 ++# Wolfgang Denk, DENX Software Engineering, wd@denx.de. ++# ++# See file CREDITS for list of people who contributed to this ++# project. ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++ ++include $(TOPDIR)/config.mk ++ ++LIB = lib$(BOARD).a ++ ++OBJS = $(BOARD).o ide.o ++ ++$(LIB): .depend $(OBJS) ++ $(AR) crv $@ $(OBJS) ++ ++######################################################################### ++ ++.depend: Makefile $(OBJS:.o=.c) ++ $(CC) -M $(CFLAGS) $(OBJS:.o=.c) > $@ ++ ++sinclude .depend ++ ++######################################################################### +--- u-boot-1.2.0.vanilla/board/qnap/qnap.c 1970-01-01 01:00:00.000000000 +0100 ++++ u-boot-1.2.0/board/qnap/qnap.c 2007-02-26 01:55:37.000000000 +0100 +@@ -0,0 +1,126 @@ ++/* ++ * Copyright (C) 2006 Andrew Luyten <u-boot@luyten.org.uk> ++ * ++ * Copyright (C) 2000 ++ * Rob Taylor, Flying Pig Systems. robt@flyingpig.com. ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ * ++ */ ++ ++#include <common.h> ++#include <mpc824x.h> ++#include <pci.h> ++ ++int checkboard (void) ++{ ++ ulong busfreq = get_bus_freq(0); ++ char buf[32]; ++ ++ printf("Board: QNAP TS-101/TS-201 local bus at %s MHz\n", strmhz(buf, busfreq)); ++ return 0; ++} ++ ++ ++long int initdram (int board_type) ++{ ++ long size; ++ long new_bank0_end; ++ long mear1; ++ long emear1; ++ ++ size = get_ram_size(CFG_SDRAM_BASE, CFG_MAX_RAM_SIZE); ++ ++ new_bank0_end = size - 1; ++ mear1 = mpc824x_mpc107_getreg(MEAR1); ++ emear1 = mpc824x_mpc107_getreg(EMEAR1); ++ mear1 = (mear1 & 0xFFFFFF00) | ++ ((new_bank0_end & MICR_ADDR_MASK) >> MICR_ADDR_SHIFT); ++ emear1 = (emear1 & 0xFFFFFF00) | ++ ((new_bank0_end & MICR_ADDR_MASK) >> MICR_EADDR_SHIFT); ++ mpc824x_mpc107_setreg(MEAR1, mear1); ++ mpc824x_mpc107_setreg(EMEAR1, emear1); ++ ++ return (size); ++} ++ ++/* ++ * Initialize PCI Devices, report devices found. ++ */ ++#ifndef CONFIG_PCI_PNP ++ ++static struct pci_config_table pci_qnap_config_table[] = { ++ /* vendor, device, class */ ++ /* bus, dev, func */ ++ ++ { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, ++ PCI_ANY_ID, 0x0f, 0, /* RTL8110SC or Intel 82540EM */ ++ /* Gigabit ethernet controller */ ++ pci_cfgfunc_config_device, { PCI_ETH_IOADDR, ++ PCI_ETH_MEMAD |