[oe-commits] org.oe.dev merge of '816810f6dfc46f435b5ae83e81e9cb7eab296ef8'
rwhitby commit
openembedded-commits at lists.openembedded.org
Sat Jul 7 18:04:16 UTC 2007
merge of '816810f6dfc46f435b5ae83e81e9cb7eab296ef8'
and 'ef8fb5f70fe8b66d3102817eaaf153ad92cb0ebb'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: cd0865ab6a23356cda048a3a27c9a131c31b5e09
ViewMTN: http://monotone.openembedded.org/revision.psp?id=cd0865ab6a23356cda048a3a27c9a131c31b5e09
Files:
1
conf/machine/fsg3be.conf
packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb
packages/arm-kernel-shim/arm-kernel-shim_1.5.bb
packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h
packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb
packages/ixp4xx/ixp4xx-npe_2.3.2.bb
packages/linux/ixp4xx-kernel.inc
Diffs:
#
# mt diff -r816810f6dfc46f435b5ae83e81e9cb7eab296ef8 -rcd0865ab6a23356cda048a3a27c9a131c31b5e09
#
#
#
# add_file "conf/machine/fsg3be.conf"
# content [614fcd1196db4ea73e6ea013cbc9b15381004779]
#
# add_file "packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb"
# content [97a66b98a8afbc6569fe7455fd79084999b95d19]
#
# patch "packages/arm-kernel-shim/arm-kernel-shim_1.5.bb"
# from [691bb266bc3a89e594d2718bda178991edd6718a]
# to [1aa10be4fd793312e013b9a67176929f2d210191]
#
# patch "packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h"
# from [15c8577df6dc6251306bcd9ff572530eaff73bfc]
# to [fed099dff45f8ede7c01a82414c61991b7fb3918]
#
# patch "packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb"
# from [1a48057dbc3a9fcb7fa92f416961ed8baa393b5d]
# to [c9dde74cca70ebe27b0fb0d8d7129d675cd1fa7b]
#
# patch "packages/ixp4xx/ixp4xx-npe_2.3.2.bb"
# from [55465679e61e65694d073e2a9d8591a9a4c5ccf3]
# to [919cd093ac19788e178bc05921f065073ddff758]
#
# patch "packages/linux/ixp4xx-kernel.inc"
# from [997dbde0491b1140eedbc3c08003e0bacac082d5]
# to [5df5d3d8b85636bea02f6cffa26e60e0ef7a3395]
#
============================================================
--- conf/machine/fsg3be.conf 614fcd1196db4ea73e6ea013cbc9b15381004779
+++ conf/machine/fsg3be.conf 614fcd1196db4ea73e6ea013cbc9b15381004779
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: Freecom FSG-3 (big-endian)
+#@DESCRIPTION: Machine configuration for an FSG3 in big-endian mode
+
+TARGET_ARCH = "armeb"
+
+PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb ixp4xxbe"
+
+MACHINE_ARCH = "ixp4xxbe"
+
+OVERRIDES = "local:${MACHINE}:ixp4xxbe:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
+
+require conf/machine/include/ixp4xx.conf
+
+# Match the vendor's latest kernel
+PREFERRED_VERSION_ixp4xx-kernel = "2.6.18"
+KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "gcc-cross-kernel-3.4.4"
+PREFERRED_VERSION_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "csl-arm-2005q3"
+
+# No room for jffs2 - the rootfs needs to be installed directly to disk
+IMAGE_FSTYPES = "tar.gz"
============================================================
--- packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb 97a66b98a8afbc6569fe7455fd79084999b95d19
+++ packages/gcc/gcc-cross-kernel-3.4.4_csl-arm-2005q3.bb 97a66b98a8afbc6569fe7455fd79084999b95d19
@@ -0,0 +1,25 @@
+# This kernel compiler is required by the Freecom FSG-3 machine
+# Please talk to Rod Whitby before considering removing this file.
+
+DEFAULT_PREFERENCE = "-1"
+
+SECTION = "devel"
+# cut-down gcc for kernel builds
+# only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
+
+require gcc-cross-initial_${PV}.bb
+
+PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
+
+SRC_URI += "file://gcc-3.4.4-makefile-fix.patch;patch=1"
+
+do_install () {
+ :
+}
+
+do_stage () {
+ cd gcc
+ oe_runmake install-common install-headers install-libgcc
+ install -m 0755 xgcc ${CROSS_DIR}/bin/${TARGET_PREFIX}gcc-${PV}
+}
+
============================================================
--- packages/arm-kernel-shim/arm-kernel-shim_1.5.bb 691bb266bc3a89e594d2718bda178991edd6718a
+++ packages/arm-kernel-shim/arm-kernel-shim_1.5.bb 1aa10be4fd793312e013b9a67176929f2d210191
@@ -5,7 +5,7 @@ PR = "r2"
LICENSE = "GPL"
PR = "r2"
-COMPATIBLE_MACHINE = "(ixp4xx|nslu2)"
+COMPATIBLE_MACHINE = "(ixp4xx|nslu2|fsg3)"
SRC_URI = "ftp://ftp.buici.com/pub/arm/arm-kernel-shim/arm-kernel-shim-${PV}.tar.gz \
file://config-nslu2.h \
============================================================
--- packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h 15c8577df6dc6251306bcd9ff572530eaff73bfc
+++ packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h fed099dff45f8ede7c01a82414c61991b7fb3918
@@ -51,11 +51,11 @@
// #define IX_NPEDL_NPEIMAGE_NPEC_DMA
// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_SPAN
// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_FIREWALL
-#define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH
+// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH
// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_ETH_LEARN_FILTER_SPAN_FIREWALL
// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
-// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL
+#define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL
#include <stdio.h>
============================================================
--- packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb 1a48057dbc3a9fcb7fa92f416961ed8baa393b5d
+++ packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb c9dde74cca70ebe27b0fb0d8d7129d675cd1fa7b
@@ -1,6 +1,6 @@ LICENSE = "Intel Public Licence"
DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
LICENSE = "Intel Public Licence"
-PR = "r0"
+PR = "r1"
SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip"
SRC_URI += "file://IxNpeMicrocode.h"
============================================================
--- packages/ixp4xx/ixp4xx-npe_2.3.2.bb 55465679e61e65694d073e2a9d8591a9a4c5ccf3
+++ packages/ixp4xx/ixp4xx-npe_2.3.2.bb 919cd093ac19788e178bc05921f065073ddff758
@@ -1,6 +1,6 @@ LICENSE = "Intel Public Licence"
DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
LICENSE = "Intel Public Licence"
-PR = "r0"
+PR = "r1"
DEPENDS = "ixp4xx-npe-native"
# You need to download the IPL_ixp400NpeLibrary-2_3_2.zip file (without crypto) from:
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
-FILES_${PN} = "${base_libdir}/firmware/NPE-B"
+FILES_${PN} = "${base_libdir}/firmware/NPE-B ${base_libdir}/firmware/NPE-C"
do_compile() {
${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be
@@ -24,10 +24,14 @@ do_install() {
rm ${S}/NPE-B
mv ${S}/NPE-B.* ${S}/NPE-B
install ${S}/NPE-B ${D}/${base_libdir}/firmware/
+ rm ${S}/NPE-C
+ mv ${S}/NPE-C.* ${S}/NPE-C
+ install ${S}/NPE-C ${D}/${base_libdir}/firmware/
}
do_populate_staging() {
install -d ${STAGING_FIRMWARE_DIR}
install ${S}/NPE-B ${STAGING_FIRMWARE_DIR}/
+ install ${S}/NPE-C ${STAGING_FIRMWARE_DIR}/
}
============================================================
--- packages/linux/ixp4xx-kernel.inc 997dbde0491b1140eedbc3c08003e0bacac082d5
+++ packages/linux/ixp4xx-kernel.inc 5df5d3d8b85636bea02f6cffa26e60e0ef7a3395
@@ -151,7 +151,7 @@ COMPATIBLE_HOST = 'arm.*-linux.*'
SRC_URI += "${IXP4XX_PATCHES}"
COMPATIBLE_HOST = 'arm.*-linux.*'
-COMPATIBLE_MACHINE = '(ixp4xx|nslu2)'
+COMPATIBLE_MACHINE = '(ixp4xx|nslu2|fsg3)'
inherit kernel
#
# mt diff -ref8fb5f70fe8b66d3102817eaaf153ad92cb0ebb -rcd0865ab6a23356cda048a3a27c9a131c31b5e09
#
#
# no changes
#
More information about the Openembedded-commits
mailing list