incorporate patches from marc in bug #273 to add support for nios2

This commit is contained in:
Mike Frysinger 2006-01-04 04:52:34 +00:00
parent b36f67cc85
commit e420a8870a
10 changed files with 71740 additions and 3 deletions

View File

@ -28,6 +28,8 @@ config BR2_mips
bool "mips"
config BR2_mipsel
bool "mipsel"
config BR2_nios2
bool "nios2"
config BR2_powerpc
bool "powerpc"
config BR2_sh
@ -93,6 +95,7 @@ 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
@ -106,7 +109,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_sh3 || BR2_sh4 || BR2_x86_64 || BR2_nios2
default "BIG" if BR2_alpha || BR2_armeb || BR2_m68k || BR2_mips || \
BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \
BR2_sh3eb || BR2_sh4eb || BR2_sparc
@ -204,4 +207,3 @@ source "toolchain/Config.in"
source "package/Config.in"
source "target/Config.in"

File diff suppressed because it is too large Load Diff

View File

@ -9,36 +9,46 @@ choice
Select the version of binutils you wish to use.
config BR2_BINUTILS_VERSION_2_14_90_0_8
depends !BR2_nios2
bool "binutils 2.14.90.0.8"
config BR2_BINUTILS_VERSION_2_15
bool "binutils 2.15"
config BR2_BINUTILS_VERSION_2_15_94_0_2_2
depends !BR2_nios2
bool "binutils 2.15.94.0.2.2"
config BR2_BINUTILS_VERSION_2_15_97
depends !BR2_nios2
bool "binutils 2.15.97"
config BR2_BINUTILS_VERSION_2_16
depends !BR2_nios2
bool "binutils 2.16"
config BR2_BINUTILS_VERSION_2_16_1
depends !BR2_nios2
bool "binutils 2.16.1"
config BR2_BINUTILS_VERSION_2_16_90_0_3
depends !BR2_nios2
bool "binutils 2.16.90.0.3"
config BR2_BINUTILS_VERSION_2_16_91_0_2
depends !BR2_nios2
bool "binutils 2.16.91.0.2"
config BR2_BINUTILS_VERSION_2_16_91_0_3
depends !BR2_nios2
bool "binutils 2.16.91.0.3"
config BR2_BINUTILS_VERSION_2_16_91_0_4
depends !BR2_nios2
bool "binutils 2.16.91.0.4"
config BR2_BINUTILS_VERSION_2_16_91_0_5
depends !BR2_nios2
bool "binutils 2.16.91.0.5"
endchoice

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -9,9 +9,11 @@ choice
Select the version of gcc you wish to use.
config BR2_GCC_VERSION_3_3_5
depends !BR2_nios2
bool "gcc 3.3.5"
config BR2_GCC_VERSION_3_3_6
depends !BR2_nios2
bool "gcc 3.3.6"
config BR2_GCC_VERSION_3_4_2
@ -21,24 +23,31 @@ choice
bool "gcc 3.4.3"
config BR2_GCC_VERSION_3_4_4
depends !BR2_nios2
bool "gcc 3.4.4"
config BR2_GCC_VERSION_3_4_5
depends !BR2_nios2
bool "gcc 3.4.5"
config BR2_GCC_VERSION_4_0_0
depends !BR2_nios2
bool "gcc 4.0.0"
config BR2_GCC_VERSION_4_0_1
depends !BR2_nios2
bool "gcc 4.0.1"
config BR2_GCC_VERSION_4_0_2
depends !BR2_nios2
bool "gcc 4.0.2"
config BR2_GCC_VERSION_4_1_0
depends !BR2_nios2
bool "gcc 4.1.0"
config BR2_GCC_VERSION_4_2_0
depends !BR2_nios2
bool "gcc 4.2.0"
endchoice

View File

@ -13,21 +13,30 @@ choice
the kernel you intend to use on your target system.
config BR2_KERNEL_HEADERS_2_4_25
depends !BR2_nios2
bool "Linux 2.4.25 kernel headers"
config BR2_KERNEL_HEADERS_2_4_27
depends !BR2_nios2
bool "Linux 2.4.27 kernel headers"
config BR2_KERNEL_HEADERS_2_4_29
depends !BR2_nios2
bool "Linux 2.4.29 kernel headers"
config BR2_KERNEL_HEADERS_2_4_31
depends !BR2_nios2
bool "Linux 2.4.31 kernel headers"
config BR2_KERNEL_HEADERS_2_6_9
bool "Linux 2.6.9 kernel headers"
config BR2_KERNEL_HEADERS_2_6_11
depends !BR2_nios2
bool "Linux 2.6.11 kernel headers"
config BR2_KERNEL_HEADERS_2_6_12
depends !BR2_nios2
bool "Linux 2.6.12 kernel headers"
endchoice
@ -38,6 +47,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
default "2.4.27" if BR2_KERNEL_HEADERS_2_4_27
default "2.4.29" if BR2_KERNEL_HEADERS_2_4_29
default "2.4.31" if BR2_KERNEL_HEADERS_2_4_31
default "2.6.9" if BR2_KERNEL_HEADERS_2_6_9
default "2.6.11" if BR2_KERNEL_HEADERS_2_6_11
default "2.6.12" if BR2_KERNEL_HEADERS_2_6_12

View File

@ -106,6 +106,9 @@ endif
$(LINUX_HEADERS_DIR)/.patched: $(LINUX_HEADERS_DIR)/.unpacked
toolchain/patch-kernel.sh $(LINUX_HEADERS_DIR) toolchain/kernel-headers linux-libc-headers-$(LINUX_VERSION)\*.patch
ifeq ($(strip $(ARCH)),nios2)
toolchain/patch-kernel.sh $(LINUX_HEADERS_DIR) toolchain/kernel-headers linux-libc-headers-$(LINUX_VERSION)-nios2nommu.patch.conditional
endif
touch $(LINUX_HEADERS_DIR)/.patched
$(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.patched
@ -124,6 +127,8 @@ $(LINUX_HEADERS_DIR)/.configured: $(LINUX_HEADERS_DIR)/.patched
(cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-mips$(NOMMU) asm;) \
elif [ "$(ARCH)" = "mipsel" ];then \
(cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-mips$(NOMMU) asm;) \
elif [ "$(ARCH)" = "nios2" ];then \
(cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-nios2nommu asm;) \
elif [ "$(ARCH)" = "arm" ];then \
(cd $(LINUX_HEADERS_DIR)/include; ln -fs asm-arm$(NOMMU) asm; \
cd asm; \

File diff suppressed because it is too large Load Diff

View File

@ -36,6 +36,7 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \
-e 's/mips.*/mips/' \
-e 's/mipsel.*/mips/' \
-e 's/cris.*/cris/' \
-e 's/nios2.*/nios2/' \
)
# just handle the ones that can be big or little
UCLIBC_TARGET_ENDIAN:=$(shell echo $(ARCH) | sed \