Skip to contentSkip to conversation

{insane, kernel-arch, site-info}.bbclass: New architecture nios2.

PATCH In review Leon Woestenberg 4 participants 39 messages Dec 6, 2009 – Jan 24, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 {insane, kernel-arch, site-info}.bbclass: New architecture nios2.

From: Walter Goossens <[email protected]>

These adds nios2 to the hard-coded architecture bits we have in the BitBake classes.

---
 classes/insane.bbclass      |    4 ++--
 classes/kernel-arch.bbclass |    2 +-
 classes/siteinfo.bbclass    |    1 +
 3 files changed, 4 insertions(+), 3 deletions(-)
classes/insane.bbclass +2 -2
index 495c3a5..4ab16ae 100644
@@ -63,8 +63,8 @@ def package_qa_get_machine_dict():
                         "i686":       (   3,     0,    0,          True,          True),
                         "mipsel":     (   8,     0,    0,          True,          True),
                         "avr32":      (6317,     0,    0,          False,         True),
-			"sh4":        (42,	 0,    0,          True,          True),
-
+                        "sh4":        (42,       0,    0,          True,          True),
+                        "nios2":      (113,      0,    0,          True,          True),
                       },
             "uclinux-uclibc" : {
                         "bfin":       ( 106,     0,    0,          True,         True),
classes/kernel-arch.bbclass +1 -1
index 8894fa5..648f50d 100644
@@ -12,7 +12,7 @@ valid_archs = "alpha cris ia64 \
                m32r mips \
 	       sh sh64 um h8300   \
 	       parisc s390  v850 \
-	       avr32 blackfin"
+	       avr32 blackfin nios2"
 
 def map_kernel_arch(a, d):
 	import re
classes/siteinfo.bbclass +1 -0
index 93cee4f..7e7b9e9 100644
@@ -52,6 +52,7 @@ def get_siteinfo_list(d):
                "mipsel-linux-uclibc":     "endian-little bit-32 common-linux common-uclibc mips-common",\
                "mips-linux":              "endian-big bit-32 common-linux common-glibc mips-common",\
                "mips-linux-uclibc":       "endian-big bit-32 common-linux common-uclibc mips-common",\
+               "nios2-linux-uclibc":      "endian-little bit-32 common-linux common-uclibc",\
                "powerpc-darwin":          "endian-big bit-32 common-darwin",\
                "ppc-linux":               "endian-big bit-32 common-linux common-glibc powerpc-common powerpc-linux",\
                "ppc64-linux":             "endian-big bit-64 common-linux common-glibc powerpc-common powerpc64-linux",\
Signature · 1 line
1.6.0.4
#1 lore raw

PATCH 1/1 nios2.conf: New architecture nios2.

From: Walter Goossens <[email protected]>

These adds nios2 to the machine configuration includes.

---
 conf/machine/include/nios2.inc |   42 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+), 0 deletions(-)
 create mode 100644 conf/machine/include/nios2.inc
conf/machine/include/nios2.inc new file +42 -0
new file mode 100644
index 0000000..f5263a6
@@ -0,0 +1,42 @@
+#@TYPE: Machine configuration
+#@NAME: nios2
+#@DESCRIPTION: generic machine configuration for nios2 (non-mmu) platforms
+
+# Set default for common nios2-based machines
+MACHINE_FEATURES ?= "kernel26 usbhost pci"
+SHARED_LIBRARIES = "no"
+
+TARGET_LDFLAGS_append = " -Wl,-elf2flt"
+
+# Select an appropriate default kernel
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-nios2"
+PREFERRED_VERSION_linux-nios2 ?= "2.6.28"
+
+# Select the nios2-specific toolchain parts
+PREFERRED_VERSION_binutils = "nios2-2.15"
+PREFERRED_VERSION_binutils-cross = "nios2-2.15"
+PREFERRED_VERSION_linux-libc-headers = "nios2-2.6.28"
+PREFERRED_VERSION_elf2flt-cross = "nios2-git"
+PREFERRED_VERSION_gcc-cross = "nios2-3.4.6"
+PREFERRED_VERSION_gcc-cross-initial = "nios2-3.4.6"
+PREFERRED_VERSION_gcc-cross-intermediate = "nios2-3.4.6"
+PREFERRED_VERSION_uclibc = "nios2-0.9.29"
+PREFERRED_VERSION_uclibc-initial = "nios2-0.9.27"
+
+# Set default for 16MB machines - can be overridden for more or less flash.
+ROOT_FLASH_SIZE ?= "12"
+
+# Allow for rootfs loaded direct from internal hard disk
+IMAGE_FSTYPES ?= "jffs2 tar.gz"
+
+# Set default
+EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x20000 -n"
+
+#-------------------------------------------------------------------------------
+# Board defaults
+#-------------------------------------------------------------------------------
+# These values are board specific but they seem to be common to a large number
+# of boards so are reasonable defaults.
+SERIAL_CONSOLE = "115200 ttyS0"
+KERNEL_CONSOLE = "ttyS0,115200n8"
+USE_VT = "0"
Signature · 1 line
1.6.0.4
#2 lore raw

PATCH 1/1 cyclone3_starter.conf: New machine/board for architecture nios2.

These adds the Altera Cyclone III FPGA Starter Kit which can run a nios2 soft-core SoC processor.

---
 conf/machine/cyclone3_starter.conf |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
 create mode 100644 conf/machine/cyclone3_starter.conf
conf/machine/cyclone3_starter.conf new file +7 -0
new file mode 100644
index 0000000..95276e7
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: Altera Cyclone III FPGA Starter 
+#@DESCRIPTION: Machine configuration for a Altera Cyclone III FPGA Starter Kit
+
+TARGET_ARCH = "nios2"
+
+require conf/machine/include/nios2.inc
Signature · 1 line
1.6.0.4
#3 lore raw

PATCH 1/1 site/nios2-linux-uclibc: Configure site file for MMU-less nios2.

---
 site/nios2-linux-uclibc |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)
 create mode 100644 site/nios2-linux-uclibc
site/nios2-linux-uclibc new file +31 -0
new file mode 100644
index 0000000..3f3f516
@@ -0,0 +1,31 @@
+ac_cv_func_getpgrp_void=yes
+ac_cv_func_setpgrp_void=yes
+ac_cv_func_setgrent_void=yes
+ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_malloc_works=yes
+
+# these are already in common-uclibc
+#ac_cv_func_posix_getpwuid_r=${ac_cv_func_posix_getpwuid_r=yes}
+#ac_cv_func_posix_getgrgid_r=${ac_cv_func_getgrgid_r=yes}
+
+ac_cv_func_setvbuf_reversed=no
+ac_cv_sizeof___int64=${ac_cv_sizeof___int64=0}
+ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
+ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
+ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
+ac_cv_sizeof_long_int=${ac_cv_sizeof_long_int=4}
+ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8}
+ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
+ac_cv_sizeof_short_int=${ac_cv_sizeof_short_int=2}
+ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
+ac_cv_sizeof_void_p=${ac_cv_sizeof_void_p=4}
+ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8}
+
+ac_cv_sys_restartable_syscalls=yes
+ac_cv_uchar=${ac_cv_uchar=no}
+ac_cv_uint=${ac_cv_uint=yes}
+ac_cv_ulong=${ac_cv_ulong=yes}
+ac_cv_ushort=${ac_cv_ushort=yes}
+
+ac_cv_time_r_type=${ac_cv_time_r_type=POSIX}
+
Signature · 1 line
1.6.0.4
#4 lore raw

PATCH 1/1 binutils-cross.inc: Stage libiberty.h for elf2flt linker wrapper.

For non-MMU targets, the binutils linker is wrapped by elf2flt, which converts ELF into a flat memory space file.

The elf2flt-cross tool needs libiberty staged. This patch stages the header file. The library seems staged into cross elsewhere, although it is vague under old packaged-staging how exactly.

---
 conf/distro/angstrom-2008.1.conf        |    2 +-
 conf/distro/include/angstrom-uclibc.inc |    2 +-
 recipes/binutils/binutils-cross.inc     |    3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)
conf/distro/angstrom-2008.1.conf +1 -1
index abc9a93..51d8242 100644
@@ -79,7 +79,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
+PREFERRED_VERSION_linux-libc-headers 	?= "2.6.31"
 
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc 		?= "2.9"
conf/distro/include/angstrom-uclibc.inc +1 -1
index 004d904..e49d078 100644
@@ -27,7 +27,7 @@ BUILD_OPTIMIZATION = "-O2 -ggdb3"
 #Note that this testing was done without the gcc-pr32889.patch.
 FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer"
 
-TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32']]}"
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32', 'nios2']]}"
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
recipes/binutils/binutils-cross.inc +3 -0
index 5808c1f..a113f7e 100644
@@ -11,6 +11,9 @@ EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
 do_stage () {
 	oe_runmake install
 
+	install -d ${CROSS_DIR}/include
+	install -m 0644 ${S}/include/libiberty.h ${CROSS_DIR}/include
+
 	# We don't really need these, so we'll remove them...
 	rm -rf ${CROSS_DIR}/lib/ldscripts
 	rm -rf ${CROSS_DIR}/share/info
Signature · 1 line
1.6.0.4
#5 lore raw

PATCH 1/1 binutils{,-cross}_nios2-2.15.bb: binutils for nios2.

This is from a non-upstream GIT'd fork of binutils, community maintained, as nios2 was never brought upstream into binutils.

---
 recipes/binutils/binutils-cross_nios2-2.15.bb |    8 +++++++
 recipes/binutils/binutils_nios2-2.15.bb       |   26 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 0 deletions(-)
 create mode 100644 recipes/binutils/binutils-cross_nios2-2.15.bb
 create mode 100644 recipes/binutils/binutils_nios2-2.15.bb
recipes/binutils/binutils-cross_nios2-2.15.bb new file +8 -0
new file mode 100644
index 0000000..047f16a
@@ -0,0 +1,8 @@
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+require binutils_${PV}.bb
+require binutils-cross.inc
+
+# nios2-linux-uclibc-ar suffers from errors against FORTIFY_SOURCE checks on
+# GCC 4.3+ with _FORTIFY_SOURCE enabled. Either fix the bugs, take an older
+# host toolchain, or disable the checks. We disable the checks:
+CFLAGS += "-U_FORTIFY_SOURCE"
recipes/binutils/binutils_nios2-2.15.bb new file +26 -0
new file mode 100644
index 0000000..f6e1a85
@@ -0,0 +1,26 @@
+INC_PR = "r2"
+PR = "${INC_PR}.1"
+
+require binutils.inc
+LICENSE = "GPLv3"
+
+# prepend this path for files in SRC_URI
+FILESPATHPKG =. "binutils-2.15.94.0.1:"
+
+SRCREV = "49396897843c932623b775168c5e6e1f2a43c3c8"
+
+SRC_URI = "git://sopc.et.ntust.edu.tw/git/binutils.git;protocol=http"
+
+SRC_URI += "\
+     file://ld_makefile.patch;patch=1 \
+     file://better_file_error.patch;patch=1 \
+     file://signed_char_fix.patch;patch=1 \
+     file://objdump_fix.patch;patch=1 \
+     file://binutils-100_cflags_for_build.patch;patch=1 \
+     file://binutils-2.15-allow-gcc-4.0.patch;patch=1"
+
+#     file://binutils-2.15.91.0.1-uclibc-100-conf.patch;patch=1 \
+#     file://binutils-2.15.90.0.3-uclibc-200-build_modules.patch;patch=1 \
+
+S = "${WORKDIR}/git"
+
Signature · 1 line
1.6.0.4
#6 lore raw

PATCH 1/1 elf2flt-cross_nios2-git.bb: elf2flt-cross for nios2.

This is from a non-upstream GIT'd fork of elf2flt, community maintained.

---
 recipes/elf2flt/elf2flt-cross_nios2-git.bb |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 recipes/elf2flt/elf2flt-cross_nios2-git.bb
recipes/elf2flt/elf2flt-cross_nios2-git.bb new file +17 -0
new file mode 100644
index 0000000..a7925cd
@@ -0,0 +1,17 @@
+DESCRIPTION = "Elf2flt is a wrapper around the linker for uclinux platforms"
+PV = "0.1"
+DEPENDS = "binutils-cross zlib-native"
+
+inherit autotools cross
+
+SRC_URI = "git://sopc.et.ntust.edu.tw/git/elf2flt.git;protocol=git;branch=nios2;tag=7f2f6c6b107fb18b6b6d3692b273a00315948da4"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECONF = " --with-libiberty=${CROSS_DIR}/lib/libiberty.a \
+                 --with-libbfd=${CROSS_DIR}/${HOST_SYS}/${TARGET_SYS}/lib/libbfd.a \
+                 --with-bfd-include-dir=${CROSS_DIR}/${HOST_SYS}/${TARGET_SYS}/include \
+                 --with-binutils-include-dir=${CROSS_DIR}/include \
+                 --disable-emit-relocs \
+               "
+
Signature · 1 line
1.6.0.4
#7 lore raw

PATCH 1/1 gcc-configure-common.inc: Introduce SHARED_LIBRARIES.

--disable-shared iff SHARED_LIBRARIES is set to "no".

By default, SHARED_LIBRARIES ?= "yes" in this file, thus this should NOT affect behaviour.

--disable-shared is needed for initial support for the newly introduced nios2 architecture in OpenEmbedded.

---
 recipes/gcc/gcc-configure-common.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
recipes/gcc/gcc-configure-common.inc +2 -1
index 8a96326..6031834 100644
@@ -14,6 +14,7 @@ OBJC_linux-uclibc ?= ""
 OBJC_avr ?= ""
 OBJC_nylon ?= ""
 OBJC ?= ",objc"
+SHARED_LIBRARIES ?= "yes"
 
 # gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
 FORTRAN ?= ",f77"
@@ -24,7 +25,7 @@ EXTRA_OECONF_PATHS ?= ""
 
 EXTRA_OECONF = "${@['--enable-clocale=generic', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']} \
                 --with-gnu-ld \
-                --enable-shared \
+                ${@['--enable-shared', '--disable-shared'][ "$SHARED_LIBRARIES" != "no" ]} \
                 --enable-target-optspace \
                 --enable-languages=${LANGUAGES} \
                 --enable-threads=posix \
Signature · 1 line
1.6.0.4
#8 lore raw

PATCH 1/1 gcc{, -cross}{, -intermediate}_nios2-3.4.6.bb: GCC for nios2.

gcc-cross for nios2. This is from a non-upstream, GIT'd fork of GCC for the nios2 architecture, community maintained.

---
 recipes/gcc/gcc-cross-initial_nios2-3.4.6.bb      |    2 ++
 recipes/gcc/gcc-cross-intermediate_nios2-3.4.6.bb |    2 ++
 recipes/gcc/gcc-cross_nios2-3.4.6.bb              |    9 +++++++++
 recipes/gcc/gcc_nios2-3.4.6.inc                   |   19 +++++++++++++++++++
 4 files changed, 32 insertions(+), 0 deletions(-)
 create mode 100644 recipes/gcc/gcc-cross-initial_nios2-3.4.6.bb
 create mode 100644 recipes/gcc/gcc-cross-intermediate_nios2-3.4.6.bb
 create mode 100644 recipes/gcc/gcc-cross_nios2-3.4.6.bb
 create mode 100644 recipes/gcc/gcc_nios2-3.4.6.inc
recipes/gcc/gcc-cross-initial_nios2-3.4.6.bb new file +2 -0
new file mode 100644
index 0000000..1639511
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-initial.inc
recipes/gcc/gcc-cross-intermediate_nios2-3.4.6.bb new file +2 -0
new file mode 100644
index 0000000..eb59de9
@@ -0,0 +1,2 @@
+require gcc-cross_${PV}.bb
+require gcc-cross-intermediate.inc
recipes/gcc/gcc-cross_nios2-3.4.6.bb new file +9 -0
new file mode 100644
index 0000000..ae439f9
@@ -0,0 +1,9 @@
+PR = "r13"
+
+require gcc_nios2-3.4.6.inc
+require gcc-cross.inc
+require gcc-configure-cross.inc
+require gcc-package-cross.inc
+
+DEPENDS += "elf2flt-cross"
+
recipes/gcc/gcc_nios2-3.4.6.inc new file +19 -0
new file mode 100644
index 0000000..9b2a54a
@@ -0,0 +1,19 @@
+JAVA = ""
+FORTRAN = ""
+OBJC = ""
+SHARED_LIBRARIES = "no"
+EXTRA_OECONF_append_nios2 = " --enable-cxx-flags=-static "
+require gcc-common.inc
+#DEPENDS += "elf2flt-cross"
+
+BINV = "3.4.6"
+PV = "nios2-3.4.6"
+
+GCCREV = "b773f7eccc6cc2ffa8fa2bd201ea62f24ba0bb41"
+SRCREV = "b773f7eccc6cc2ffa8fa2bd201ea62f24ba0bb41"
+
+SRC_URI = "git://sopc.et.ntust.edu.tw/git/gcc3.git;protocol=http;branch=nios2-linux"
+
+S = "${WORKDIR}/git"
+
+SRC_URI += "file://gcc-posix-open-fix.patch;patch=1"
Signature · 1 line
1.6.0.4
#9 lore raw

PATCH 1/1 uclibc{, -cross}{, -initial}_nios2-0.9.2{7, 9}.bb: nios2 fork.

uclibc with nios2 support from a community maintained fork in GIT.

This fork might actually be pushed back upstream by this community (TODO: check this and switch to upstream uclibc if so).

---
 recipes/uclibc/uclibc-initial_nios2-0.9.27.bb      |   32 ++++
 .../uclibc/uclibc-nios2-0.9.27/nios2/uClibc.config |  186 ++++++++++++++++++++
 .../uclibc/uclibc-nios2-0.9.29/nios2/uClibc.config |  186 ++++++++++++++++++++
 recipes/uclibc/uclibc.inc                          |    8 +-
 recipes/uclibc/uclibc_nios2-0.9.27.bb              |   19 ++
 recipes/uclibc/uclibc_nios2-0.9.29.bb              |   28 +++
 6 files changed, 456 insertions(+), 3 deletions(-)
 create mode 100644 recipes/uclibc/uclibc-initial_nios2-0.9.27.bb
 create mode 100644 recipes/uclibc/uclibc-nios2-0.9.27/nios2/uClibc.config
 create mode 100644 recipes/uclibc/uclibc-nios2-0.9.29/nios2/uClibc.config
 create mode 100644 recipes/uclibc/uclibc_nios2-0.9.27.bb
 create mode 100644 recipes/uclibc/uclibc_nios2-0.9.29.bb
recipes/uclibc/uclibc-initial_nios2-0.9.27.bb new file +32 -0
new file mode 100644
index 0000000..83c69a8
@@ -0,0 +1,32 @@
+SECTION = "base"
+require uclibc_${PV}.bb
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+DEPENDS = "linux-libc-headers  ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+PACKAGES = ""
+
+do_install() {
+	# Install initial headers into the cross dir
+	make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+		install_headers #pregen install_dev
+	#ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+
+	# This conflicts with the c++ version of this header
+	rm -f ${D}${includedir}/bits/atomicity.h
+	install -d ${D}${libdir}/
+	install -m 644 lib/crt[1in].o ${D}${libdir}/
+	install -d ${D}${libdir}/
+	install -m 644 lib/libc.so ${D}${libdir}/
+}
+
+do_compile () {
+	make -j1 V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+		lib/crt1.o lib/crti.o lib/crtn.o
+#               libc/sysdeps/linux/${TARGET_ARCH}/crt1.o \
+#               libc/sysdeps/linux/${TARGET_ARCH}/crti.o \
+#               libc/sysdeps/linux/${TARGET_ARCH}/crtn.o
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o lib/libc.so
+}
recipes/uclibc/uclibc-nios2-0.9.27/nios2/uClibc.config new file +186 -0

186 lines not on this page · raw message

recipes/uclibc/uclibc-nios2-0.9.29/nios2/uClibc.config new file +186 -0

186 lines not on this page · raw message

recipes/uclibc/uclibc.inc +5 -3
index 903aea2..f63efd7 100644
@@ -176,8 +176,10 @@ do_install() {
         oe_runmake "SSP_ALL_CFLAGS=${TARGET_LINK_HASH_STYLE}" utils
         oe_runmake STRIPTOOL=true PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
                 install_utils
-	
-	# oe_runstrip needs +x on files	
-	chmod +x ${D}/${base_libdir}/*
+	# see gcc/gcc-configure-common.inc for SHARED_LIBRARIES
+	if [ "x$SHARED_LIBRARIESy" != "xnoy"; then
+		# oe_runstrip needs +x on files	
+		chmod +x ${D}/${base_libdir}/*
+	fi
 }
 
recipes/uclibc/uclibc_nios2-0.9.27.bb new file +19 -0
new file mode 100644
index 0000000..1fd729d
@@ -0,0 +1,19 @@
+DEFAULT_PREFERENCE = "1"
+
+require uclibc.inc
+PR = "${INC_PR}.0"
+
+PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
+
+SRC_URI += "http://127.0.0.1/uClibc-${PV}.tar.bz2"
+S = "${WORKDIR}/uClibc"
+
+#recent versions uclibc require real kernel headers
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#as stated above, uclibc needs real kernel-headers
+#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
+KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}"
+
+#SRC_URI += "http://127.0.0.1/uClibc-${PV}.tar.bz2"
+#S = "${WORKDIR}/git"
recipes/uclibc/uclibc_nios2-0.9.29.bb new file +28 -0
new file mode 100644
index 0000000..414101f
@@ -0,0 +1,28 @@
+DEFAULT_PREFERENCE = "1"
+
+require uclibc.inc
+PR = "${INC_PR}.0"
+
+PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
+
+# from GIT
+SRC_URI = "git://sopc.et.ntust.edu.tw/git/uClibc.git;protocol=http"
+S = "${WORKDIR}/git"
+SRCREV = "e355ed8763cb157ac865bc298478f6ef8c984a11"
+
+# or from an archive:
+#SRC_URI = "http://127.0.0.1/uClibc-${PV}.tar.bz2"
+#S = "${WORKDIR}/uClibc"
+
+SRC_URI += "${@['${UCLIBC_LOCALE_URI}', ''][bb.data.getVar('USE_NLS', d, 1) != 'yes']} \
+file://uClibc.config \
+"
+
+#recent versions uclibc require real kernel headers
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+#as stated above, uclibc needs real kernel-headers
+#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
+KERNEL_SOURCE = "${STAGING_DIR_HOST}/${exec_prefix}"
+
+
Signature · 1 line
1.6.0.4
#10 lore raw

PATCH 1/1 angstrom-uclibc.inc: Exempt nios2 from GNU hash style.

---
 conf/distro/include/angstrom-uclibc.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/include/angstrom-uclibc.inc +1 -1
index e49d078..004d904 100644
@@ -27,7 +27,7 @@ BUILD_OPTIMIZATION = "-O2 -ggdb3"
 #Note that this testing was done without the gcc-pr32889.patch.
 FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer"
 
-TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32', 'nios2']]}"
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32']]}"
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
Signature · 1 line
1.6.0.4
#11 lore raw

PATCH 1/1 angstrom-2008.1.conf: Use ?= on PREFERRED_VERSION_linux-libc-headers.

This allows machines/archs to override towards older kernels and matching headers. This was needed for nios2.

---
 conf/distro/angstrom-2008.1.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/angstrom-2008.1.conf +1 -1
index 51d8242..abc9a93 100644
@@ -79,7 +79,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers 	?= "2.6.31"
+PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
 
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc 		?= "2.9"
Signature · 1 line
1.6.0.4
#12 lore raw

PATCH 1/1 sane-srcrevs.inc: Add PREFERRED_VERSION_linux-libc-headers for nios2.

---
 conf/distro/include/sane-srcrevs.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
conf/distro/include/sane-srcrevs.inc +1 -0
index 22fa976..e6a8ad3 100644
@@ -150,6 +150,7 @@ SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1089"
+SRCREV_pn-linux-libs-headers_nios2 = "d01303a1035a39e445007c7522d89ad985c4153c"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
Signature · 1 line
1.6.0.4
#13 lore raw

PATCH 1/1 angstrom-uclibc.inc: Exempt nios2 architecture from GNU hash style.

---
 conf/distro/include/angstrom-uclibc.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/include/angstrom-uclibc.inc +1 -1
index 004d904..e49d078 100644
@@ -27,7 +27,7 @@ BUILD_OPTIMIZATION = "-O2 -ggdb3"
 #Note that this testing was done without the gcc-pr32889.patch.
 FULL_OPTIMIZATION_avr32 = "-Os -fomit-frame-pointer"
 
-TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32']]}"
+TARGET_LINK_HASH_STYLE = "${@['-Wl,--hash-style=gnu',''][bb.data.getVar('TARGET_ARCH',d,1) in ['mips', 'mipsel', 'avr32', 'nios2']]}"
 
 CXXFLAGS += "-fvisibility-inlines-hidden"
 
Signature · 1 line
1.6.0.4
#14 lore raw

PATCH 1/1 linux-libc-headers_nios2-2.6.28: nios2 fork.

---
 .../headless_hwselect.patch                        |  120 +
 .../linux-libc-headers-nios2-2.6.28/procinfo.h     |   24 +
 .../linux-libc-headers-nios2-2.6.28/system.ptf     | 3492 ++++++++++++++++++++
 3 files changed, 3636 insertions(+), 0 deletions(-)
 create mode 100644 recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/headless_hwselect.patch
 create mode 100644 recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/procinfo.h
 create mode 100755 recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/system.ptf
recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/headless_hwselect.patch new file +120 -0
new file mode 100644
index 0000000..3029f69
@@ -0,0 +1,120 @@
+diff -urPN nios2-linux-test-dm/linux-2.6/arch/nios2/Makefile nios2-linux/linux-2.6/arch/nios2/Makefile
+--- nios2-linux-test-dm/linux-2.6/arch/nios2/Makefile	2009-07-30 10:27:19.000000000 +0000
++++ nios2-linux/linux-2.6/arch/nios2/Makefile	2009-08-17 15:07:40.000000000 +0000
+@@ -134,7 +134,8 @@
+ 	mkdir -p $(dir $(objtree)/$(HARDWARE_MK)); \
+ 	perl -I$(TOPDIR)/arch/$(ARCH)/scripts \
+ 		$(srctree)/arch/$(ARCH)/scripts/hwselect.pl $(SYSPTF) \
+-		$(objtree)/$(HARDWARE_MK)
++		$(objtree)/$(HARDWARE_MK) \
++		$(CPU_SELECTION) $(MEM_SELECTION)
+ endef
+ 
+ .PHONY: hwselect
+diff -urPN nios2-linux-test-dm/linux-2.6/arch/nios2/scripts/hwselect.pl nios2-linux/linux-2.6/arch/nios2/scripts/hwselect.pl
+--- nios2-linux-test-dm/linux-2.6/arch/nios2/scripts/hwselect.pl	2009-07-30 10:27:19.000000000 +0000
++++ nios2-linux/linux-2.6/arch/nios2/scripts/hwselect.pl	2009-08-17 15:05:45.000000000 +0000
+@@ -14,6 +14,10 @@
+ my $index;
+ my $system;
+ 
++my $cpu_selection;
++my $cpu_index = -1;
++my $mem_selected;
++my $mem_index = -1;
+ #
+ # Subroutine: Prompt user for an answer
+ #
+@@ -36,8 +40,12 @@
+ #
+ # Check for correct number of args
+ #
+-
+-if (scalar (@ARGV) != 2) {
++if (scalar (@ARGV) == 4) {
++	$ptf_filename = $ARGV[0];
++	$target_filename = $ARGV[1];
++	$cpu_index = $ARGV[2];
++	$mem_index = $ARGV[3];	
++} elsif (scalar (@ARGV) != 2) {
+ 	print STDERR "ERROR: Invalid number of parameters.\n";
+ 	exit;
+ } else {
+@@ -67,27 +75,37 @@
+ # Grab listing of Nios II processors and force user to select one:
+ # 
+ 
+-print "\n--- Please select which CPU you wish to build the kernel against:\n\n";
+-
+ my @cpulist = $system->getCPUList ('altera_nios2');
+-my %cpuinfo;
+-
+-$index = 1;
+-foreach my $cpu (@cpulist) {
+-	my $cpu_module = $system->getCPU ($cpu);
+-	if ($cpu_module->isEnabled ()) {
+-		my $class = $cpu_module->getClass();
+-		my $type = $cpu_module->getWSAAssignment('cpu_selection');
+-		my $version = $cpu_module->getVersion();
+-
+-		print "($index) $cpu - Class: $class Type: $type Version: $version\n";
++if( scalar(@cpulist) == 1 )
++{
++# Only one CPU to choose from...
++	$cpu_index = 1;
++}
++if (($cpu_index <= 0) || ($cpu_index > scalar(@cpulist))) {
++	print "\n--- Please select which CPU you wish to build the kernel against:\n\n";
++
++	my %cpuinfo;
++	
++	$index = 1;
++	foreach my $cpu (@cpulist) {
++		my $cpu_module = $system->getCPU ($cpu);
++		if ($cpu_module->isEnabled ()) {
++			my $class = $cpu_module->getClass();
++			my $type = $cpu_module->getWSAAssignment('cpu_selection');
++			my $version = $cpu_module->getVersion();
++	
++			print "($index) $cpu - Class: $class Type: $type Version: $version\n";
++		}
++		$index += 1;
+ 	}
+-	$index += 1;
+-}
+ 
+-print "\n";
++	print "\n";
+ 
+-my $cpu_selection = $cpulist[request_answer (1, $index - 1) - 1];
++	$cpu_selection = $cpulist[request_answer (1, $index - 1) - 1];
++} else {
++	$cpu_selection = $cpulist[($cpu_index-1)];
++	print "Selected ($cpu_index) $cpu_selection as the main CPU";
++}
+ 
+ #
+ # Grab list of memory devices that $cpu_selection is hooked up to:
+@@ -109,6 +127,7 @@
+ #
+ # Select program memory to execute kernel from:
+ # 
++
+ print "\n--- Please select a device to execute kernel from:\n\n";
+ 
+ $index = 1;
+@@ -119,7 +138,13 @@
+ }
+ 
+ my @memlist = keys (%meminfo);
+-my $mem_selected = $memlist[request_answer (1, $index - 1) - 1];
++if( scalar(@memlist) == 1)
++{
++	$mem_index = 1;
++} elsif (($mem_index <= 0) || ($mem_index > scalar(@memlist))) {
++	$mem_index = request_answer (1, $index -1);
++}
++$mem_selected = $memlist[$mem_index - 1];
+ 
+ print "\n--- Summary using\n\n";
+ print "PTF: $ptf_filename\n";
recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/procinfo.h new file +24 -0
new file mode 100644
index 0000000..8cdf828
@@ -0,0 +1,24 @@
+/*
+ *  linux/include/asm-arm/procinfo.h
+ *
+ *  Copyright (C) 1996-1999 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ASM_PROCINFO_H
+#define __ASM_PROCINFO_H
+
+#define HWCAP_SWP	1
+#define HWCAP_HALF	2
+#define HWCAP_THUMB	4
+#define HWCAP_26BIT	8	/* Play it safe */
+#define HWCAP_FAST_MULT	16
+#define HWCAP_FPA	32
+#define HWCAP_VFP	64
+#define HWCAP_EDSP	128
+#define HWCAP_JAVA	256
+#define HWCAP_IWMMXT	512
+#define HWCAP_CRUNCH	1024
+#endif
recipes/linux-libc-headers/linux-libc-headers-nios2-2.6.28/system.ptf new file +3492 -0

2,856 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.6.0.4

Part of the diff is not shown here. View the raw message.

#15 lore raw

PATCH 1/1 uclibc-initial-nios2-0.9.29: For nios2, go to 0.9.29.

---
 conf/machine/include/nios2.inc                     |    2 +-
 recipes/uclibc/uclibc-initial_nios2-0.9.27.bb      |   32 ----
 recipes/uclibc/uclibc-initial_nios2-0.9.29.bb      |   32 ++++
 .../uclibc/uclibc-nios2-0.9.27/nios2/uClibc.config |  186 --------------------
 4 files changed, 33 insertions(+), 219 deletions(-)
 delete mode 100644 recipes/uclibc/uclibc-initial_nios2-0.9.27.bb
 create mode 100644 recipes/uclibc/uclibc-initial_nios2-0.9.29.bb
 delete mode 100644 recipes/uclibc/uclibc-nios2-0.9.27/nios2/uClibc.config
conf/machine/include/nios2.inc +1 -1
index f5263a6..e23c72d 100644
@@ -21,7 +21,7 @@ PREFERRED_VERSION_gcc-cross = "nios2-3.4.6"
 PREFERRED_VERSION_gcc-cross-initial = "nios2-3.4.6"
 PREFERRED_VERSION_gcc-cross-intermediate = "nios2-3.4.6"
 PREFERRED_VERSION_uclibc = "nios2-0.9.29"
-PREFERRED_VERSION_uclibc-initial = "nios2-0.9.27"
+PREFERRED_VERSION_uclibc-initial = "nios2-0.9.29"
 
 # Set default for 16MB machines - can be overridden for more or less flash.
 ROOT_FLASH_SIZE ?= "12"
recipes/uclibc/uclibc-initial_nios2-0.9.27.bb deleted +0 -32
deleted file mode 100644
index 83c69a8..0000000
@@ -1,32 +0,0 @@
-SECTION = "base"
-require uclibc_${PV}.bb
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-DEPENDS = "linux-libc-headers  ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
-PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
-PACKAGES = ""
-
-do_install() {
-	# Install initial headers into the cross dir
-	make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
-		install_headers #pregen install_dev
-	#ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
-
-	# This conflicts with the c++ version of this header
-	rm -f ${D}${includedir}/bits/atomicity.h
-	install -d ${D}${libdir}/
-	install -m 644 lib/crt[1in].o ${D}${libdir}/
-	install -d ${D}${libdir}/
-	install -m 644 lib/libc.so ${D}${libdir}/
-}
-
-do_compile () {
-	make -j1 V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
-		lib/crt1.o lib/crti.o lib/crtn.o
-#               libc/sysdeps/linux/${TARGET_ARCH}/crt1.o \
-#               libc/sysdeps/linux/${TARGET_ARCH}/crti.o \
-#               libc/sysdeps/linux/${TARGET_ARCH}/crtn.o
-	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
-		-o lib/libc.so
-}
recipes/uclibc/uclibc-initial_nios2-0.9.29.bb new file +32 -0
new file mode 100644
index 0000000..83c69a8
@@ -0,0 +1,32 @@
+SECTION = "base"
+require uclibc_${PV}.bb
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-${PV}', '${FILE_DIRNAME}/uclibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+DEPENDS = "linux-libc-headers  ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+PACKAGES = ""
+
+do_install() {
+	# Install initial headers into the cross dir
+	make V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+		install_headers #pregen install_dev
+	#ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+
+	# This conflicts with the c++ version of this header
+	rm -f ${D}${includedir}/bits/atomicity.h
+	install -d ${D}${libdir}/
+	install -m 644 lib/crt[1in].o ${D}${libdir}/
+	install -d ${D}${libdir}/
+	install -m 644 lib/libc.so ${D}${libdir}/
+}
+
+do_compile () {
+	make -j1 V=1 CC="${CC}" PREFIX=${D} DEVEL_PREFIX=${prefix}/ RUNTIME_PREFIX=/ \
+		lib/crt1.o lib/crti.o lib/crtn.o
+#               libc/sysdeps/linux/${TARGET_ARCH}/crt1.o \
+#               libc/sysdeps/linux/${TARGET_ARCH}/crti.o \
+#               libc/sysdeps/linux/${TARGET_ARCH}/crtn.o
+	${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+		-o lib/libc.so
+}
recipes/uclibc/uclibc-nios2-0.9.27/nios2/uClibc.config deleted +0 -186

186 lines not on this page · raw message

Signature · 1 line
1.6.0.4
#16 lore raw

PATCH 1/1 linux-libc-headers_nios2-2.6.28.bb: Missed the .bb file earlier.

---
 .../linux-libc-headers_nios2-2.6.28.bb             |   83 ++++++++++++++++++++
 1 files changed, 83 insertions(+), 0 deletions(-)
 create mode 100644 recipes/linux-libc-headers/linux-libc-headers_nios2-2.6.28.bb
recipes/linux-libc-headers/linux-libc-headers_nios2-2.6.28.bb new file +83 -0
new file mode 100644
index 0000000..0cefc2c
@@ -0,0 +1,83 @@
+require linux-libc-headers.inc
+
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
+PR = "r3"
+
+#SRCREV = "3146b39c185f8a436d430132457e84fa1d8f8208"
+SRCREV = "d01303a1035a39e445007c7522d89ad985c4153c"
+
+SRC_URI = "git://sopc.et.ntust.edu.tw/git/linux-2.6.git;branch=test-nios2;protocol=http \
+           file://procinfo.h \
+           file://system.ptf \
+           file://headless_hwselect.patch;patch=1;pnum=2 \
+	  "
+
+#           file://hardware.mk \
+#           file://defconfig \
+
+S = "${WORKDIR}/git"
+
+#SRC_URI = "http://127.0.0.1/linux-nios2-2.6.28-git.tbz \
+#           file://procinfo.h \
+#           file://system.ptf"
+#S = "${WORKDIR}/linux-2.6"
+
+set_arch() {
+	case ${TARGET_ARCH} in
+		alpha*)   ARCH=alpha ;;
+		arm*)     ARCH=arm ;;
+		cris*)    ARCH=cris ;;
+		hppa*)    ARCH=parisc ;;
+		i*86*)    ARCH=i386 ;;
+		ia64*)    ARCH=ia64 ;;
+		mips*)    ARCH=mips ;;
+		m68k*)    ARCH=m68k ;;
+		powerpc*) ARCH=powerpc ;;
+		s390*)    ARCH=s390 ;;
+		sh*)      ARCH=sh ;;
+		sparc64*) ARCH=sparc64 ;;
+		sparc*)   ARCH=sparc ;;
+		x86_64*)  ARCH=x86_64 ;;
+	        avr32*)   ARCH=avr32 ;;
+                bfin*)    ARCH=blackfin ;;
+		nios2*)	  ARCH=nios2 ;;
+	esac
+}
+
+do_configure() {
+	set_arch
+#	cp ../hardware.mk arch/nios2
+	oe_runmake hwselect SYSPTF=../system.ptf CPU_SELECTION=1 MEM_SELECTION=2 ARCH=$ARCH
+	oe_runmake allnoconfig ARCH=$ARCH
+}
+
+do_compile () {
+}
+
+do_install() {
+	set_arch
+	oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix} ARCH=$ARCH
+}
+
+do_install_append_arm() {
+	cp ${WORKDIR}/procinfo.h ${D}${includedir}/asm/
+}
+
+STAGE_TEMP="${WORKDIR}/temp-staging"
+
+do_stage () {
+	set_arch
+	echo $ARCH
+	rm -rf ${STAGE_TEMP}
+	mkdir -p ${STAGE_TEMP}
+	oe_runmake headers_install INSTALL_HDR_PATH=${STAGE_TEMP}${exec_prefix} ARCH=$ARCH
+	if [ "$ARCH" = "arm" ]; then
+		cp ${WORKDIR}/procinfo.h ${STAGE_TEMP}${includedir}/asm/
+	fi
+	install -d ${STAGING_INCDIR}
+	rm -rf ${STAGING_INCDIR}/linux ${STAGING_INCDIR}/asm ${STAGING_INCDIR}/asm-generic
+	cp -pfLR ${STAGE_TEMP}${includedir}/linux ${STAGING_INCDIR}/
+	cp -pfLR ${STAGE_TEMP}${includedir}/asm ${STAGING_INCDIR}/
+	cp -pfLR ${STAGE_TEMP}${includedir}/asm-generic ${STAGING_INCDIR}/
+}
Signature · 1 line
1.6.0.4
#17 lore raw

PATCH 1/1 linux-nios2-2.6.28: Linux kernel for nios2 machines.

---
 recipes/linux/linux-nios2/2.6.28+nios2/defconfig  |  554 +++
 recipes/linux/linux-nios2/2.6.28+nios2/procinfo.h |   24 +
 recipes/linux/linux-nios2/2.6.28+nios2/system.ptf | 4416 +++++++++++++++++++++
 recipes/linux/linux-nios2_2.6.28.bb               |   36 +
 4 files changed, 5030 insertions(+), 0 deletions(-)
 create mode 100644 recipes/linux/linux-nios2/2.6.28+nios2/defconfig
 create mode 100644 recipes/linux/linux-nios2/2.6.28+nios2/procinfo.h
 create mode 100644 recipes/linux/linux-nios2/2.6.28+nios2/system.ptf
 create mode 100644 recipes/linux/linux-nios2_2.6.28.bb
recipes/linux/linux-nios2/2.6.28+nios2/defconfig new file +554 -0
new file mode 100644
index 0000000..d8bfbf8
@@ -0,0 +1,554 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.28
+# Tue Nov  3 10:21:38 2009
+#
+# CONFIG_FPU is not set
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_TIME=y
+CONFIG_NO_IOPORT=y
+# CONFIG_HOTPLUG_CPU is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SYSVIPC is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE="/home/walter/sandbox/SYGEG1/angstrom-dev//deploy/uclibc/images/sygeg1/initramfs_root.cpio"
+CONFIG_INITRAMFS_ROOT_UID=500
+CONFIG_INITRAMFS_ROOT_GID=500
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+# CONFIG_KALLSYMS is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+# CONFIG_ELF_CORE is not set
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+# CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+# CONFIG_AIO is not set
+# CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_TINY_SHMEM=y
+CONFIG_BASE_SMALL=0
+# CONFIG_MODULES is not set
+# CONFIG_BLOCK is not set
+CONFIG_CLASSIC_RCU=y
+# CONFIG_FREEZER is not set
+
+#
+# Processor type and features
+#
+
+#
+# Platform dependant setup
+#
+CONFIG_NIOS2=y
+# CONFIG_MMU is not set
+CONFIG_AXON_CARD=y
+# CONFIG_MICROTRONIX_UKIT is not set
+# CONFIG_MICROTRONIX_STRATIX is not set
+# CONFIG_MICROTRONIX_CYCLONE is not set
+# CONFIG_MICROTRONIX_PSK is not set
+# CONFIG_ALTERA_STRATIX is not set
+# CONFIG_ALTERA_STRATIX_PRO is not set
+# CONFIG_ALTERA_STRATIX_II is not set
+# CONFIG_ALTERA_CYCLONE is not set
+# CONFIG_ALTERA_CYCLONE_II is not set
+# CONFIG_ALTERA_CYCLONE_1C12_EVAL is not set
+# CONFIG_ALTERA_DE2 is not set
+# CONFIG_ALTERA_NEEK_C3 is not set
+CONFIG_AXON_SYGEG1=y
+# CONFIG_NIOS2_HW_MUL_OFF is not set
+CONFIG_NIOS2_HW_MUL=y
+# CONFIG_NIOS2_HW_MULX is not set
+
+#
+# Platform drivers Options
+#
+# CONFIG_AVALON_DMA is not set
+# CONFIG_PCI_ALTPCI is not set
+# CONFIG_I2C_NIOS2_GPIO is not set
+CONFIG_ALTERA_REMOTE_UPDATE=y
+
+#
+# Miscellaneous Options
+#
+CONFIG_EXCALIBUR=y
+# CONFIG_BREAK_ON_START is not set
+CONFIG_FORCE_MAX_ZONEORDER=14
+CONFIG_RAMKERNEL=y
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_HZ_100=y
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=100
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_CMDLINE=""
+# CONFIG_PASS_CMDLINE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_VIRT_TO_BUS=y
+CONFIG_BOOT_LINK_OFFSET=0x00500000
+
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+# CONFIG_PCI is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_FLAT=y
+CONFIG_BINFMT_ZFLAT=y
+# CONFIG_BINFMT_SHARED_FLAT is not set
+# CONFIG_HAVE_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+# CONFIG_PM is not set
+# CONFIG_NET is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_START=0x8000000
+CONFIG_MTD_PHYSMAP_LEN=0
+CONFIG_MTD_PHYSMAP_BANKWIDTH=2
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_AXON_AXONBUS is not set
+CONFIG_AXON_AXONBUS_HWA=y
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_ICS932S401 is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
+
+#
+# SCSI device support
+#
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_DEVKMEM is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NIOS_LCD_16207 is not set
+# CONFIG_NIOS_BUTTON is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_ALTERA_JTAGUART is not set
+CONFIG_SERIAL_ALTERA_UART=y
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=1
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+CONFIG_SERIAL_ALTERA_UART_CONSOLE=y
+# CONFIG_UNIX98_PTYS is not set
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=10
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_R3964 is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_HELPER_AUTO=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_OCORES=y
+# CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+CONFIG_AT24=y
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+CONFIG_SENSORS_MAX7311=y
+CONFIG_SENSORS_MAX7311_NUMCLIENTS=1
+CONFIG_SENSORS_MAX7311_ADDRESSES="0x24"
+# CONFIG_SENSORS_LMH1982 is not set
+# CONFIG_SENSORS_ADM1178 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_SPI is not set
+CONFIG_W1=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_DS2482=y
+
+#
+# 1-wire Slaves
+#
+# CONFIG_W1_SLAVE_THERM is not set
+CONFIG_W1_SLAVE_SMEM=y
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_ALTERA_REMOTE_UPDATE_WATCHDOG=y
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_REGULATOR is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_SOUND is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+# CONFIG_DNOTIFY is not set
+# CONFIG_INOTIFY is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_SYSCTL is not set
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_NLS is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+
+#
+# Tracers
+#
+# CONFIG_PREEMPT_TRACER is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_BOOT_TRACER is not set
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_SAMPLES is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_DMA=y
recipes/linux/linux-nios2/2.6.28+nios2/procinfo.h new file +24 -0
new file mode 100644
index 0000000..8cdf828
@@ -0,0 +1,24 @@
+/*
+ *  linux/include/asm-arm/procinfo.h
+ *
+ *  Copyright (C) 1996-1999 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ASM_PROCINFO_H
+#define __ASM_PROCINFO_H
+
+#define HWCAP_SWP	1
+#define HWCAP_HALF	2
+#define HWCAP_THUMB	4
+#define HWCAP_26BIT	8	/* Play it safe */
+#define HWCAP_FAST_MULT	16
+#define HWCAP_FPA	32
+#define HWCAP_VFP	64
+#define HWCAP_EDSP	128
+#define HWCAP_JAVA	256
+#define HWCAP_IWMMXT	512
+#define HWCAP_CRUNCH	1024
+#endif
recipes/linux/linux-nios2/2.6.28+nios2/system.ptf new file +4416 -0

2,422 lines not on this page · raw message

recipes/linux/linux-nios2_2.6.28.bb new file +36 -0
new file mode 100644
index 0000000..031f4f5

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.6.0.4

Part of the diff is not shown here. View the raw message.

#18 lore raw

PATCH 1/1 gnu-config-20050701: Add nios2 system support.

From: Walter Goossens <[email protected]>

---
 recipes/gnu-config/gnu-config/nios2.patch |   20 ++++++++++++++++++++
 recipes/gnu-config/gnu-config_20050701.bb |    3 ++-
 2 files changed, 22 insertions(+), 1 deletions(-)
 create mode 100644 recipes/gnu-config/gnu-config/nios2.patch
recipes/gnu-config/gnu-config/nios2.patch new file +20 -0
new file mode 100644
index 0000000..d790ed1
@@ -0,0 +1,20 @@
+Index: config/config.sub
+===================================================================
+--- config.orig/config.sub
++++ config/config.sub
+@@ -259,6 +259,7 @@ case $basic_machine in
+ 	| mn10200 | mn10300 \
+ 	| ms1 \
+ 	| msp430 \
++	| nios2 | nios2eb | nios2el \
+ 	| ns16k | ns32k \
+ 	| openrisc | or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+@@ -338,6 +339,7 @@ case $basic_machine in
+ 	| mmix-* \
+ 	| ms1-* \
+ 	| msp430-* \
++	| nios2-* | nios2eb-* | nios2el-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
recipes/gnu-config/gnu-config_20050701.bb +2 -1
index 8ee0a32..537d745 100644
@@ -6,11 +6,12 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 FIXEDSRCDATE = "${@bb.data.getVar('FILE', d, 1).split('_')[-1].split('.')[0]}"
 PV = "0.1+cvs${FIXEDSRCDATE}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "cvs://[email protected]/cvsroot/config;module=config;method=pserver;date=${FIXEDSRCDATE} \
 	   file://config-guess-uclibc.patch;patch=1 \
            file://avr32.patch;patch=1 \
+           file://nios2.patch;patch=1 \
            file://gnu-configize.in"
 S = "${WORKDIR}/config"
 
Signature · 1 line
1.6.0.4
#19 lore raw

PATCH 1/1 angstrom-2008.1.conf: Conditionally set linux-libc-header version.

Systems with non-upstream kernel need an older linux-libc-header version. Use ?= instead of = so that machines can override the version.

---
 conf/distro/angstrom-2008.1.conf |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/angstrom-2008.1.conf +1 -1
index abc9a93..51d8242 100644
@@ -79,7 +79,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
+PREFERRED_VERSION_linux-libc-headers 	?= "2.6.31"
 
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc 		?= "2.9"
Signature · 1 line
1.6.0.4
#20 lore raw

PATCH 1/1 angstrom-2008.1.conf: Hard-code the nios2 version for linux-libc-headers.

---
 conf/distro/angstrom-2008.1.conf |    3 ++-
 conf/machine/include/nios2.inc   |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)
conf/distro/angstrom-2008.1.conf +2 -1
index 51d8242..63f6e3d 100644
@@ -79,7 +79,8 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers 	?= "2.6.31"
+PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
+PREFERRED_VERSION_linux-libc-headers_nios2	= "nios2-2.6.28"
 
 #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
 PREFERRED_VERSION_glibc 		?= "2.9"
conf/machine/include/nios2.inc +1 -0
index e23c72d..6a693fc 100644
@@ -15,6 +15,7 @@ PREFERRED_VERSION_linux-nios2 ?= "2.6.28"
 # Select the nios2-specific toolchain parts
 PREFERRED_VERSION_binutils = "nios2-2.15"
 PREFERRED_VERSION_binutils-cross = "nios2-2.15"
+# For Angstrom, this is set in angstrom-2008.1.conf
 PREFERRED_VERSION_linux-libc-headers = "nios2-2.6.28"
 PREFERRED_VERSION_elf2flt-cross = "nios2-git"
 PREFERRED_VERSION_gcc-cross = "nios2-3.4.6"
Signature · 1 line
1.6.0.4
#21 lore raw

Re: [PATCH] linux-nios2-2.6.28: Linux kernel for nios2 machines.

In reply to Leon Woestenberg

Dnia niedziela, 6 grudnia 2009 o 23:44:53 Leon Woestenberg napisał(a):

recipes/linux/linux-nios2_2.6.28.bb line 5

Quoted 12 lines
(quoted diff) +0 -0
 b/recipes/linux/linux-nios2_2.6.28.bb new file mode 100644

index 0000000..031f4f5

recipes/linux/linux-nios2_2.6.28.bb new file +5 -0
@@ -0,0 +1,36 @@
+INHIBIT_DEFAULT_DEPS = "1"
+DEPENDS += "unifdef-native"
+PR = "r3"
+
 
+FILESPATH = "${FILE_DIRNAME}/${PN}/${PV}"

drop that

Quoted 6 lines
recipes/linux/linux-nios2_2.6.28.bb new file +2 -0
+
+#SRC_URI =
 "git://sopc.et.ntust.edu.tw/git/linux-2.6.git;branch=test-nios2;tags=3146b

39c185f8a436d430132457e84fa1d8f8208
\ +SRC_URI =
"http://127.0.0.1/linux-nios2-2.6.28-git.tbz \

Can you put it online so other people can fetch and build it? I know that hardware is yours but think autobuilders or weird build tests.

recipes/linux/linux-nios2_2.6.28.bb line 16

Quoted 8 lines
recipes/linux/linux-nios2_2.6.28.bb new file +8 -0
+           file://procinfo.h \
+           file://system.ptf"
+SRC_URI += "file://defconfig"
+
+S = "${WORKDIR}/linux-2.6"
+
+COMPATIBLE_HOST = 'nios2.*-linux.*'
+COMPATIBLE_MACHINE = '(nios2|sygeg1)'

So which kernel supports "cyclone3-starter" machine? And you can use COMPATIBLE_MACHINE without COMPATIBLE_HOST.

Quoted 1 line

+inherit kernel

Why not "require linux.inc"?

Quoted 1 line

+ARCH = "nios2"

Was not that set in machine config?

Quoted 1 line

+KERNEL_IMAGETYPE = "zImage"

This is default - drop.

recipes/linux/linux-nios2_2.6.28.bb line 29

Quoted 8 lines
recipes/linux/linux-nios2_2.6.28.bb new file +7 -0
+
+do_configure() {
 
+        rm -f ${S}/.config
+
+        if [ ! -e ${WORKDIR}/defconfig ]; then
+                die "No default configuration for ${MACHINE} available."
+        fi

This part is already in linux.inc - use it?

recipes/linux/linux-nios2_2.6.28.bb

Quoted 8 lines
recipes/linux/linux-nios2_2.6.28.bb new file +3 -0
+	echo
 "CONFIG_INITRAMFS_SOURCE=\"${DEPLOY_DIR_IMAGE}/initramfs_root.cpio\""   >>
 ${S}/.config +        sed -e '/CONFIG_INITRAMFS_SOURCE/d'
 '${WORKDIR}/defconfig' >>'${S}/.config' +
+	oe_runmake hwselect SYSPTF=../system.ptf CPU_SELECTION=1 MEM_SELECTION=2
 ARCH=$ARCH +        yes '' | oe_runmake oldconfig
+}

Regards,

Signature · 3 lines
JID:      [email protected]
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
#22 lore raw

Re: [PATCH] linux-libc-headers_nios2-2.6.28: nios2 fork.

In reply to Leon Woestenberg
Quoted 7 lines · Leon Woestenberg
---
  .../headless_hwselect.patch                        |  120 +
  .../linux-libc-headers-nios2-2.6.28/procinfo.h     |   24 +
  .../linux-libc-headers-nios2-2.6.28/system.ptf     | 3492 ++++++++++++++++++++

Same comment about screwing up versioning as gcc, binutils and uclibc

#23 lore raw

Re: [PATCH] sane-srcrevs.inc: Add PREFERRED_VERSION_linux-libc-headers for nios2.

In reply to Leon Woestenberg

conf/distro/include/sane-srcrevs.inc

Quoted 8 lines · Leon Woestenberg
---
  conf/distro/include/sane-srcrevs.inc |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
conf/distro/include/sane-srcrevs.inc +1 -0
 
+SRCREV_pn-linux-libs-headers_nios2 = "d01303a1035a39e445007c7522d89ad985c4153c"

Using a machine override make it non-generic. Anyway, since the cabal said checksums belong in the recipe, SRCREVs should be in there as well.

regards,

Koen

#24 lore raw

Re: [PATCH] sane-srcrevs.inc: Add PREFERRED_VERSION_linux-libc-headers for nios2.

Hello Koen,

Quoted 8 lines · Koen Kooi
Quoted 2 lines · Leon Woestenberg

+SRCREV_pn-linux-libs-headers_nios2 =
"d01303a1035a39e445007c7522d89ad985c4153c"

Using a machine override make it non-generic. Anyway, since the cabal said checksums belong in the recipe, SRCREVs should be in there as well.

Removed from sane-srcrev. I leave it in the non-generic recipe.

Thanks,

Signature · 1 line
Leon
#25 lore raw

Re: [PATCH] angstrom-2008.1.conf: Use ?= on PREFERRED_VERSION_linux-libc-headers.

In reply to Leon Woestenberg
Quoted 13 lines · Leon Woestenberg

This allows machines/archs to override towards older kernels and matching headers. This was needed for nios2.

---
  conf/distro/angstrom-2008.1.conf |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
conf/distro/angstrom-2008.1.conf +0 -0
index 51d8242..abc9a93 100644

conf/distro/angstrom-2008.1.conf PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20" · line 85

Quoted 8 lines
conf/distro/angstrom-2008.1.conf +1 -1
@@ -79,7 +79,7 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
  #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
 
  #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers 	?= "2.6.31"
+PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
 
  #Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
  PREFERRED_VERSION_glibc 		?= "2.9"

NAK

If an arch really needs another version you need to do

PREFERRED_VERSION_linux-libc-headers_nios2 = "2.6.other"

That way we know that it is nios that needs an older kernel. The actual preferred solution is to patch nios2 support into linux-libc-headers-2.6.31.

regards,

Koen

#26 lore raw

Re: [PATCH] angstrom-2008.1.conf: Use ?= on PREFERRED_VERSION_linux-libc-headers.

Hello Koen,

Quoted 4 lines · Koen Kooi

That way we know that it is nios that needs an older kernel. The actual preferred solution is to patch nios2 support into linux-libc-headers-2.6.31.

The first fix is in my local branch.

I will do the second fix when I attack the MMU variant of the architecture.

Thanks,

Regards,

Signature · 1 line
Leon
#27 lore raw

Re: [PATCH] uclibc{, -cross}{, -initial}_nios2-0.9.2{7, 9}.bb: nios2 fork.

In reply to Leon Woestenberg
Quoted 10 lines · Leon Woestenberg

uclibc with nios2 support from a community maintained fork in GIT.

This fork might actually be pushed back upstream by this community (TODO: check this and switch to upstream uclibc if so).

---
  recipes/uclibc/uclibc-initial_nios2-0.9.27.bb      |   32 ++++

That's bogus. Change that to 0.9.27-nios2 or put nios2 in PR, but don't screw up uclibc versioning.

regards,

Koen

#28 lore raw

Re: [PATCH] uclibc{, -cross}{, -initial}_nios2-0.9.2{7, 9}.bb: nios2 fork.

Hello Koen,

Quoted 7 lines · Koen Kooi
Quoted 6 lines · Leon Woestenberg

uclibc with nios2 support from a community maintained fork in GIT.

This fork might actually be pushed back upstream by this community (TODO: check this and switch to upstream uclibc if so).

Quoted 9 lines
Quoted 5 lines

---
 recipes/uclibc/uclibc-initial_nios2-0.9.27.bb      |   32 ++++

That's bogus. Change that to 0.9.27-nios2 or put nios2 in PR, but don't screw up uclibc versioning.

Argh. That's how I started!

Then I consulted the TSC^W IRC channel and "nios2-<version>" was suggested instead.

Regards,

Signature · 1 line
Leon
#29 lore raw

Re: [PATCH] uclibc{, -cross}{, -initial}_nios2-0.9.2{7, 9}.bb: nios2 fork.

In reply to Koen Kooi

Hello Koen,

Quoted 7 lines · Koen Kooi
Quoted 2 lines · Leon Woestenberg

 recipes/uclibc/uclibc-initial_nios2-0.9.27.bb      |   32 ++++

That's bogus. Change that to 0.9.27-nios2 or put nios2 in PR, but don't screw up uclibc versioning.

Thanks for the review!

Sorry for letting my initial frustration out. I should have really questioned this approach, but I cannot the reason anymore why it was suggested.

/likewise is looking into his IRC logs.

Greetings,

Signature · 1 line
Leon
#30 lore raw

Re: [PATCH] gcc{, -cross}{, -intermediate}_nios2-3.4.6.bb: GCC for nios2.

In reply to Leon Woestenberg

recipes/gcc/gcc_nios2-3.4.6.inc line 10

Quoted 2 lines · Leon Woestenberg
recipes/gcc/gcc_nios2-3.4.6.inc new file +2 -0
+BINV = "3.4.6"
+PV = "nios2-3.4.6"

That's bogus. Change that to 3.4.6-nios2 or put nios2 in PR, but don't screw up gcc versioning.

regards,

Koen

#31 lore raw

Re: [PATCH] gcc{, -cross}{, -intermediate}_nios2-3.4.6.bb: GCC for nios2.

Hello Koen,

Quoted 4 lines · Koen Kooi

On 06-12-09 23:44, Leon Woestenberg wrote:

That's bogus. Change that to 3.4.6-nios2 or put nios2 in PR, but don't screw up gcc versioning.

nios2-<version> has been fixed to <version>-nios2 my local branch.

Thanks for the review and remarks,

Regards,

Signature · 1 line
Leon
#32 lore raw

Re: [PATCH] binutils{, -cross}_nios2-2.15.bb: binutils for nios2.

In reply to Leon Woestenberg
Quoted 9 lines · Leon Woestenberg

This is from a non-upstream GIT'd fork of binutils, community maintained, as nios2 was never brought upstream into binutils.

---
  recipes/binutils/binutils-cross_nios2-2.15.bb |    8 +++++++
  recipes/binutils/binutils_nios2-2.15.bb       |   26 +++++++++++++++++++++++++

That's bogus. Change that to 2.15-nios2 or put nios2 in PR, but don't screw up binutils versioning.

regards,

Koen

#33 lore raw

Re: [PATCH] binutils{, -cross}_nios2-2.15.bb: binutils for nios2.

Hello Koen,

Quoted 9 lines
Quoted 4 lines

---
 recipes/binutils/binutils-cross_nios2-2.15.bb |    8 +++++++ recipes/binutils/binutils_nios2-2.15.bb       |   26
+++++++++++++++++++++++++

That's bogus. Change that to 2.15-nios2 or put nios2 in PR, but don't screw up binutils versioning.

nios2-<version> has been fixed to <version>-nios2 my local branch.

Thanks for the review and remarks,

Regards,

Signature · 1 line
Leon
#34 lore raw

Re: [PATCH] cyclone3_starter.conf: New machine/board for architecture nios2.

In reply to Leon Woestenberg

Dnia niedziela, 6 grudnia 2009 o 23:44:38 Leon Woestenberg napisał(a):

Quoted 8 lines

These adds the Altera Cyclone III FPGA Starter Kit which can run a nios2 soft-core SoC processor.

---
 conf/machine/cyclone3_starter.conf |    7 +++++++

Do not use underscore in names as this conflicts with OVERRIDES.

Regards,

Signature · 3 lines
JID:      [email protected]
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz
#35 lore raw

Re: [PATCH] cyclone3_starter.conf: New machine/board for architecture nios2.

Hello Marcin,

Quoted 3 lines · Marcin Juszkiewicz

Do not use underscore in names as this conflicts with OVERRIDES.

Thanks, will be fixed.

Regards,

Signature · 1 line
Leon
#36 lore raw

Re: [PATCH] nios2.conf: New architecture nios2.

In reply to Leon Woestenberg

conf/machine/include/nios2.inc line 24

Quoted 10 lines · Leon Woestenberg
conf/machine/include/nios2.inc new file +10 -0
+# Select the nios2-specific toolchain parts
+PREFERRED_VERSION_binutils = "nios2-2.15"
+PREFERRED_VERSION_binutils-cross = "nios2-2.15"
+PREFERRED_VERSION_linux-libc-headers = "nios2-2.6.28"
+PREFERRED_VERSION_elf2flt-cross = "nios2-git"
+PREFERRED_VERSION_gcc-cross = "nios2-3.4.6"
+PREFERRED_VERSION_gcc-cross-initial = "nios2-3.4.6"
+PREFERRED_VERSION_gcc-cross-intermediate = "nios2-3.4.6"
+PREFERRED_VERSION_uclibc = "nios2-0.9.29"
+PREFERRED_VERSION_uclibc-initial = "nios2-0.9.27"

NAK

This doesn't belong in a machine.conf, it belongs in the distro.

regards,

Koen

#37 lore raw

Re: [PATCH] nios2.conf: New architecture nios2.

Hello,

Quoted 15 lines · Koen Kooi

conf/machine/include/nios2.inc line 24

Quoted 10 lines · Leon Woestenberg
conf/machine/include/nios2.inc new file +10 -0
+# Select the nios2-specific toolchain parts
+PREFERRED_VERSION_binutils = "nios2-2.15"
+PREFERRED_VERSION_binutils-cross = "nios2-2.15"
+PREFERRED_VERSION_linux-libc-headers = "nios2-2.6.28"
+PREFERRED_VERSION_elf2flt-cross = "nios2-git"
+PREFERRED_VERSION_gcc-cross = "nios2-3.4.6"
+PREFERRED_VERSION_gcc-cross-initial = "nios2-3.4.6"
+PREFERRED_VERSION_gcc-cross-intermediate = "nios2-3.4.6"
+PREFERRED_VERSION_uclibc = "nios2-0.9.29"
+PREFERRED_VERSION_uclibc-initial = "nios2-0.9.27"

NAK

Quoted 2 lines

This doesn't belong in a machine.conf, it belongs in the distro.

Hmm, the architecture file (conf/machine/nios2.conf) is the most related file to give sane defaults for the toolchain etc.

Of course distro's and end-users can override that, but I think this information belongs with the machine or underlying architecture by default.

I will change it, but my opinion is per above, unless some good reasons are given why we shouldn't use the system where higher-level .conf files can override lower-level .conf files.

Regards,

Signature · 1 line
Leon