gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get rid of broken nios2 support 

Has been marked as broken for more than 1 year, with no indication
that anyone cares, and it needs a bunch of special handling.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2010-03-30 17:18:25 +02:00
parent 8628082b83
commit f220498f4b
15 changed files with 23 additions and 8073 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,7 +1,7 @@
2010.05, Not yet released
Toolchain: uClibc 0.9.30.3, older 0.9.30.x removed. 2.6.33
kernel headers, binutils 2.20.1.
kernel headers, binutils 2.20.1, removed broken nios2 support.
X.org updated to 7.5.

3
package/liboil/liboil.mk
View File

@ -19,9 +19,6 @@ endif
ifeq ($(BR2_cris),y)
LIBOIL_CONF_ENV = as_cv_unaligned_access=yes
endif
ifeq ($(BR2_nios2),y)
LIBOIL_CONF_ENV = as_cv_unaligned_access=no
endif
ifeq ($(BR2_x86_64),y)
LIBOIL_CONF_ENV = as_cv_unaligned_access=yes
endif

2
package/ltrace/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_LTRACE
bool "ltrace"
depends on !(BR2_avr32 || BR2_cris || BR2_mips || BR2_mipsel || BR2_nios2 || BR2_sh || BR2_sh64 || BR2_xtensa)
depends on !(BR2_avr32 || BR2_cris || BR2_mips || BR2_mipsel || BR2_sh || BR2_sh64 || BR2_xtensa)
select BR2_PACKAGE_LIBELF
help
Debugging program which runs a specified command until it exits.

3
package/multimedia/gstreamer/gstreamer.mk
View File

@ -15,9 +15,6 @@ GSTREAMER_LIBTOOL_PATCH = NO
ifeq ($(BR2_avr32),y)
GSTREAMER_CONF_ENV = as_cv_unaligned_access=no
endif
ifeq ($(BR2_nios2),y)
GSTREAMER_CONF_ENV = as_cv_unaligned_access=no
endif
GSTREAMER_CONF_OPT = \
--disable-examples \

1
package/qt/Config.in
View File

@ -248,7 +248,6 @@ config BR2_PACKAGE_QT_EMB_PLATFORM
default "generic" if BR2_alpha
default "generic" if BR2_chris
default "generic" if BR2_m68k
default "generic" if BR2_nios2
default "generic" if BR2_sh
default "generic" if BR2_sh64
default "generic" if BR2_sparc

7
target/Config.in.arch
View File

@ -28,9 +28,6 @@ config BR2_mips
bool "mips"
config BR2_mipsel
bool "mipsel"
config BR2_nios2
bool "nios2"
depends on BROKEN # no kernel headers
config BR2_powerpc
bool "powerpc"
config BR2_sh
@ -519,7 +516,6 @@ config BR2_ARCH
default "m68k" if BR2_m68k
default "mips" if BR2_mips
default "mipsel" if BR2_mipsel
default "nios2" if BR2_nios2
default "powerpc" if BR2_powerpc
default "sh2a_nofpueb" if BR2_sh2a_nofpueb
default "sh2eb" if BR2_sh2eb
@ -543,8 +539,7 @@ config BR2_ARCH
config BR2_ENDIAN
string
default "LITTLE" if BR2_arm || BR2_cris || BR2_i386 || BR2_mipsel || \
BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_nios2 || \
BR2_sh64
BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_sh64
default "BIG" if BR2_alpha || BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \
BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \
BR2_sh3eb || BR2_sh4eb || BR2_sparc || BR2_sparc64

4
toolchain/Config.in.2
View File

@ -76,11 +76,11 @@ config BR2_USE_WCHAR
config BR2_PREFER_SOFT_FLOAT
bool
default y if BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel || BR2_nios2
default y if BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel
config BR2_SOFT_FLOAT
bool "Use software floating point by default"
depends on BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel || BR2_powerpc || BR2_nios2
depends on BR2_arm || BR2_armeb || BR2_avr32 || BR2_mips || BR2_mipsel || BR2_powerpc
default $(BR2_PREFER_SOFT_FLOAT)
help
If your target CPU does not have a Floating Point Unit (FPU) or a

13
toolchain/binutils/Config.in
View File

@ -9,12 +9,12 @@ choice
Select the version of binutils you wish to use.
config BR2_BINUTILS_VERSION_2_17
depends on !BR2_nios2 && !BR2_avr32
depends on !BR2_avr32
depends on BR2_DEPRECATED
bool "binutils 2.17"
config BR2_BINUTILS_VERSION_2_18
depends on !BR2_nios2 && !BR2_avr32
depends on !BR2_avr32
depends on BR2_DEPRECATED
bool "binutils 2.18"
@ -23,29 +23,28 @@ choice
bool "binutils 2.18-avr32-1.0.1"
config BR2_BINUTILS_VERSION_2_19
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
depends on BR2_DEPRECATED
bool "binutils 2.19"
config BR2_BINUTILS_VERSION_2_19_1
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
depends on BR2_DEPRECATED
bool "binutils 2.19.1"
config BR2_BINUTILS_VERSION_2_20
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
depends on BR2_DEPRECATED || BR2_RECENT
bool "binutils 2.20"
config BR2_BINUTILS_VERSION_2_20_1
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
bool "binutils 2.20.1"
endchoice
config BR2_BINUTILS_VERSION
string
default "2.15" if BR2_nios2
default "2.17" if BR2_BINUTILS_VERSION_2_17
default "2.18" if BR2_BINUTILS_VERSION_2_18
default "2.18-avr32-1.0.1" if BR2_BINUTILS_VERSION_2_18_AVR32_1_0_1

5
toolchain/elf2flt/elf2flt.mk
View File

@ -14,11 +14,6 @@ $(ELF2FLT_DIR)/.unpacked:
touch $@
$(ELF2FLT_DIR)/.patched: $(ELF2FLT_DIR)/.unpacked
ifeq ($(strip $(ARCH)),nios2)
$(SED) "s,STAGING_DIR,$(STAGING_DIR),g;" toolchain/elf2flt/elf2flt.nios2.conditional
$(SED) "s,CROSS_COMPILE_PREFIX,$(REAL_GNU_TARGET_NAME),g;" toolchain/elf2flt/elf2flt.nios2.conditional
toolchain/patch-kernel.sh $(ELF2FLT_DIR) toolchain/elf2flt elf2flt.nios2.conditional
endif
$(CONFIG_UPDATE) $(@D)
touch $@

47
toolchain/elf2flt/elf2flt.nios2.conditional
View File

@ -1,47 +0,0 @@
--- elf2flt/elf2flt.ld
+++ elf2flt/elf2flt.ld
@@ -63,12 +63,16 @@
*(.eh_frame)
*(.gcc_except_table)
+ /* nios2 need gp */
+ _gp = ABSOLUTE(ALIGN(16) + 0x7ff0);
+ PROVIDE(gp = _gp);
+
/* Microblaze has .sdata and .sbss (small bss). They must
be contiguous, so please don't move any of this. JW */
_ssrw = . ;
*(.sdata)
*(.sdata.*)
- *(.sbss) /* Don't move this! */
+ *(.sbss .gnu.linkonce.sb*) /* Don't move this! */
_essrw = . ;
_ssrw_size = _essrw - _ssrw;
@@ -176,4 +180,6 @@
.debug_line 0 : { *(.debug_line) }
.debug_pubnames 0 : { *(.debug_pubnames) }
.debug_aranges 0 : { *(.debug_aranges) }
+ .debug_frame 0 : { *(.debug_frame) }
+ .debug_str 0 : { *(.debug_str) }
}
--- elf2flt/ld-elf2flt.in
+++ elf2flt/ld-elf2flt.in
@@ -132,7 +132,7 @@
esac
ARG1="$ARG1 -defsym $GOT_OFFSET=`expr ${SHARED_ID} '*' -4 - 4`"
fi
- if [ "@emit_relocs@" = "yes" ]
+ if [ "no" = "yes" ]
then
SEDOP="$SEDOP -e s/^SINGLE_LINK://"
else
@@ -155,7 +155,7 @@
LDSCRIPT="$NEWLDSCRIPT"
fi
- if [ "@emit_relocs@" = "yes" ]
+ if [ "no" = "yes" ]
then
$LINKER $EMUL $SDIRS -T $LDSCRIPT -q -o "$OFILE.gdb" $ARG1 ||exit $?
RFILE="$OFILE.gdb"

18
toolchain/gcc/Config.in
View File

@ -10,12 +10,12 @@ choice
Select the version of gcc you wish to use.
config BR2_GCC_VERSION_4_1_2
depends on !BR2_nios2 && !BR2_avr32
depends on !BR2_avr32
depends on BR2_DEPRECATED
bool "gcc 4.1.2"
config BR2_GCC_VERSION_4_2_1
depends on !BR2_nios2 && !BR2_avr32
depends on !BR2_avr32
depends on BR2_DEPRECATED
bool "gcc 4.2.1"
@ -29,35 +29,35 @@ choice
bool "gcc 4.2.2-avr32-2.1.5"
config BR2_GCC_VERSION_4_2_3
depends on !BR2_nios2 && !BR2_avr32
depends on !BR2_avr32
depends on BR2_DEPRECATED
bool "gcc 4.2.3"
config BR2_GCC_VERSION_4_2_4
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
depends on BR2_RECENT || BR2_DEPRECATED
bool "gcc 4.2.4"
config BR2_GCC_VERSION_4_3_2
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
depends on BR2_DEPRECATED
bool "gcc 4.3.2"
config BR2_GCC_VERSION_4_3_3
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
depends on BR2_RECENT || BR2_DEPRECATED
bool "gcc 4.3.3"
config BR2_GCC_VERSION_4_3_4
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
bool "gcc 4.3.4"
config BR2_GCC_VERSION_4_4_X
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
bool "gcc 4.4.x"
config BR2_GCC_VERSION_SNAP
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
bool "gcc snapshot"
endchoice

7978
toolchain/gdb/6.6/700-nios2-6.6.patch
View File

File diff suppressed because it is too large Load Diff

4
toolchain/gdb/Config.in
View File

@ -27,12 +27,12 @@ choice
config BR2_GDB_VERSION_6_4
bool "gdb 6.4"
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
depends on BR2_DEPRECATED
config BR2_GDB_VERSION_6_5
bool "gdb 6.5"
depends on !BR2_avr32 && !BR2_nios2
depends on !BR2_avr32
depends on BR2_DEPRECATED
config BR2_GDB_VERSION_6_6

2
toolchain/kernel-headers/kernel-headers.mk
View File

@ -19,7 +19,7 @@ KERNEL_ARCH:=$(shell $(SHELL) -c "echo \"$(ARCH)\" | sed -e \"s/-.*//\" \
-e s/parisc64/parisc/ \
-e s/powerpc64/powerpc/ \
-e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
-e s/sh.*/sh/ -e s/nios2.*/nios2nommu/")
-e s/sh.*/sh/")
include toolchain/kernel-headers/kernel-headers-new.makefile

7
toolchain/uClibc/uclibc.mk
View File

@ -38,7 +38,6 @@ UCLIBC_TARGET_ARCH:=$(shell $(SHELL) -c "echo $(ARCH) | sed \
-e 's/mips.*/mips/' \
-e 's/mipsel.*/mips/' \
-e 's/cris.*/cris/' \
-e 's/nios2.*/nios2/' \
-e 's/xtensa.*/xtensa/' \
")
# just handle the ones that can be big or little
@ -192,12 +191,6 @@ ifeq ($(BR2_mips_64),y)
$(SED) 's/.*\(CONFIG_MIPS_ISA_MIPS64\).*/\1=y/' $(UCLIBC_DIR)/.oldconfig
endif
endif
ifeq ($(UCLIBC_TARGET_ARCH),nios2)
/bin/echo "# UCLIBC_FORMAT_FDPIC_ELF is not set" >> $(UCLIBC_DIR)/.oldconfig
/bin/echo "UCLIBC_FORMAT_FLAT=y" >> $(UCLIBC_DIR)/.oldconfig
/bin/echo "# UCLIBC_FORMAT_FLAT_SEP_DATA is not set" >> $(UCLIBC_DIR)/.oldconfig
/bin/echo "# UCLIBC_FORMAT_SHARED_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig
endif
ifeq ($(UCLIBC_TARGET_ARCH),sh)
/bin/echo "# CONFIG_SH2A is not set" >> $(UCLIBC_DIR)/.oldconfig
/bin/echo "# CONFIG_SH2 is not set" >> $(UCLIBC_DIR)/.oldconfig