Commit d5247aa8 authored by Phil Edworthy's avatar Phil Edworthy Committed by Peter Korsgaard
Browse files

sh: Fix Buildroot sh targets to match gnuconfig targets 



sh2eb and sh2a_nofpueb gnuconfig targets are no longer supported
in Buildroot. This patch replaces these Buildroot targets with sh2
and sh2a respectively, and adds sh4a targets as these are widely
used.

To build for devices without an fpu, the relevant toolchain flags
will have to be specified.

Signed-off-by: default avatarPhil Edworthy <phil.edworthy@renesas.com>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent b8ee6635

fs/jffs2/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -94,8 +94,8 @@ choice 
	prompt "Endianess"

	default BR2_TARGET_ROOTFS_JFFS2_BE if BR2_armeb || \

			BR2_avr32 || BR2_m68k || BR2_mips || \

			BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \

			BR2_sh3eb || BR2_sh4eb || BR2_sparc

			BR2_powerpc || BR2_sh2 || BR2_sh2a || \

			BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc



config BR2_TARGET_ROOTFS_JFFS2_LE

	bool "little-endian"

target/Config.in.arch

+19 −13
Original line number Diff line number Diff line
@@ -211,18 +211,22 @@ choice 
	help

	  Specific CPU variant to use



config BR2_sh2a_nofpueb

	bool "sh2a_nofpueb"

config BR2_sh2eb

	bool "sh2eb"

config BR2_sh2

	bool "sh2 (SH2 big endian)"

config BR2_sh2a

	bool "sh2a (SH2A big endian)"

config BR2_sh3

	bool "sh3"

	bool "sh3 (SH3 little endian)"

config BR2_sh3eb

	bool "sh3eb"

	bool "sh3eb (SH3 big endian)"

config BR2_sh4

	bool "sh4"

	bool "sh4 (SH4 little endian)"

config BR2_sh4eb

	bool "sh4eb"

	bool "sh4eb (SH4 big endian)"

config BR2_sh4a

	bool "sh4a (SH4A little endian)"

config BR2_sh4aeb

	bool "sh4aeb (SH4A big endian)"

endchoice



#
@@ -489,12 +493,14 @@ config BR2_ARCH 
	default "mips"		if BR2_mips

	default "mipsel"	if BR2_mipsel

	default "powerpc"	if BR2_powerpc

	default "sh2a_nofpueb"	if BR2_sh2a_nofpueb

	default "sh2eb"		if BR2_sh2eb

	default "sh2"		if BR2_sh2

	default "sh2a"		if BR2_sh2a

	default "sh3"		if BR2_sh3

	default "sh3eb"		if BR2_sh3eb

	default "sh4"		if BR2_sh4

	default "sh4eb"		if BR2_sh4eb

	default "sh4a"		if BR2_sh4a

	default "sh4aeb"	if BR2_sh4aeb

	default "sh64"		if BR2_sh64

	default "sparc"		if BR2_sparc

	default "x86_64"	if BR2_x86_64
@@ -510,10 +516,10 @@ config BR2_ARCH 
config BR2_ENDIAN

	string

	default "LITTLE" if BR2_arm || BR2_bfin || BR2_i386 || BR2_mipsel || \

			    BR2_sh3 || BR2_sh4 || BR2_x86_64 || BR2_sh64

			    BR2_sh3 || BR2_sh4 || BR2_sh4a || BR2_x86_64 || BR2_sh64

	default "BIG"    if BR2_armeb || BR2_avr32 || BR2_m68k || BR2_mips || \

			    BR2_powerpc || BR2_sh2a_nofpueb || BR2_sh2eb || \

			    BR2_sh3eb || BR2_sh4eb || BR2_sparc

			    BR2_powerpc || BR2_sh2 || BR2_sh2a || \

			    BR2_sh3eb || BR2_sh4eb || BR2_sh4aeb || BR2_sparc



config BR2_GCC_TARGET_TUNE

	string

toolchain/elf2flt/elf2flt/config.sub

+4 −4
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ case $basic_machine in 
	| pdp10 | pdp11 | pj | pjl \

	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \

	| pyramid \

	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \

	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \

	| sh64 | sh64le \

	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \

	| sparcv8 | sparcv9 | sparcv9b \
@@ -342,8 +342,8 @@ case $basic_machine in 
	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \

	| pyramid-* \

	| romp-* | rs6000-* \

	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \

	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \

	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* \

	| sheb-* | shbe-* | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \

	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \

	| sparclite-* \

	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
@@ -1097,7 +1097,7 @@ case $basic_machine in 
	we32k)

		basic_machine=we32k-att

		;;

	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)

	sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele)

		basic_machine=sh-unknown

		;;

	sh64)

toolchain/toolchain-external/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009 


config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009

	bool "CodeSoucery SH 2010.09"

	depends on BR2_sh4 || BR2_sh4eb

	depends on BR2_sh4a || BR2_sh4aeb

	select BR2_TOOLCHAIN_EXTERNAL_GLIBC

	select BR2_INSTALL_LIBSTDCPP

	help
@@ -154,7 +154,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009 


config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009

	bool "CodeSoucery SH 2010.09"

	depends on BR2_sh2a_nofpueb || BR2_sh2eb

	depends on BR2_sh2a

	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC

	select BR2_INSTALL_LIBSTDCPP

	help

toolchain/uClibc/uclibc.mk

+2 −2
Original line number Diff line number Diff line
@@ -182,14 +182,14 @@ ifeq ($(UCLIBC_TARGET_ARCH),sh) 
	/bin/echo "# CONFIG_SH2 is not set" >> $(UCLIBC_DIR)/.oldconfig

	/bin/echo "# CONFIG_SH3 is not set" >> $(UCLIBC_DIR)/.oldconfig

	/bin/echo "# CONFIG_SH4 is not set" >> $(UCLIBC_DIR)/.oldconfig

ifeq ($(BR2_sh2a_nofpueb),y)

ifeq ($(BR2_sh2a),y)

	$(SED) 's,# CONFIG_SH2A is not set,CONFIG_SH2A=y,g' $(UCLIBC_DIR)/.oldconfig

	/bin/echo "# UCLIBC_FORMAT_FDPIC_ELF is not set" >> $(UCLIBC_DIR)/.oldconfig

	/bin/echo "# UCLIBC_FORMAT_FLAT is not set" >> $(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 ($(BR2_sh2eb),y)

ifeq ($(BR2_sh2),y)

	$(SED) 's,# CONFIG_SH2 is not set,CONFIG_SH2=y,g' $(UCLIBC_DIR)/.oldconfig

	/bin/echo "# UCLIBC_FORMAT_FDPIC_ELF is not set" >> $(UCLIBC_DIR)/.oldconfig

	/bin/echo "# UCLIBC_FORMAT_FLAT is not set" >> $(UCLIBC_DIR)/.oldconfig