[xtensa-cvscommit] linux/arch/xtensa Makefile,1.2,1.3 config.in,1.2,1.3
Brought to you by:
zankel
|
From: <joe...@us...> - 2002-10-23 20:53:51
|
Update of /cvsroot/xtensa/linux/arch/xtensa
In directory usw-pr-cvs1:/tmp/cvs-serv28395/arch/xtensa
Modified Files:
Makefile config.in
Log Message:
Add processor config information for two additional configs: linux_le and linux_test. Also make the selection of processor configuration selectable at kernel-configuration time. linux_be is the default.
Index: Makefile
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 6 Sep 2002 20:30:40 -0000 1.2
--- Makefile 23 Oct 2002 20:53:18 -0000 1.3
***************
*** 40,44 ****
LIBS += $(LIBGCC)
! ifeq ($(CONFIG_XTENSA_ISS),y)
PLATFORM = iss
#xcc libs
--- 40,44 ----
LIBS += $(LIBGCC)
! ifeq ($(CONFIG_XTENSA_PLATFORM_ISS),y)
PLATFORM = iss
#xcc libs
***************
*** 50,54 ****
endif
! ifeq ($(CONFIG_XTENSA_XT2000),y)
PLATFORM = xt2000
#xcc libs
--- 50,54 ----
endif
! ifeq ($(CONFIG_XTENSA_PLATFORM_XT2000),y)
PLATFORM = xt2000
#xcc libs
***************
*** 56,59 ****
--- 56,73 ----
endif
+ ifeq ($(CONFIG_XTENSA_CONFIG_LINUX_BE),y)
+ XTENSA_CONFIG = linux_be
+ endif
+ ifeq ($(CONFIG_XTENSA_CONFIG_LINUX_LE),y)
+ XTENSA_CONFIG = linux_le
+ endif
+ ifeq ($(CONFIG_XTENSA_CONFIG_LINUX_TEST),y)
+ XTENSA_CONFIG = linux_test
+ endif
+ ifeq "$(XTENSA_CONFIG)" ""
+ XTENSA_CONFIG = linux_be
+ endif
+
+
export CFLAGS
export AFLAGS
***************
*** 68,72 ****
# Use the compile-time HAL to identify endianess.
! CORE_H := include/asm-$(ARCH)/xtensa/config/core.h
ENDIAN_STRING := $(shell grep XCHAL_HAVE_BE $(CORE_H) | grep 1 )
ifeq "$(ENDIAN_STRING)" ""
--- 82,87 ----
# Use the compile-time HAL to identify endianess.
! PCONF := include/asm-$(ARCH)/xtensa/config-$(XTENSA_CONFIG)
! CORE_H := $(PCONF)/core.h
ENDIAN_STRING := $(shell grep XCHAL_HAVE_BE $(CORE_H) | grep 1 )
ifeq "$(ENDIAN_STRING)" ""
***************
*** 82,92 ****
# Use the compiler to identify endianess and verify XTENSA_{BIG,LITTLE}_ENDIAN
CC_ENDIAN_STRING := $(shell echo 'main(){}' | $(CC) -E -dM -xc - | grep __XTENSA_EB__)
ifeq "$(CC_ENDIAN_STRING)" ""
ifeq "$(XTENSA_LITTLE_ENDIAN)" "n"
! $(error Your $(CC) and file $(CORE_H) mismatch on endianess)
endif
endif
-
# The "tools" subdirectory needs to be built before all others.
--- 97,113 ----
# Use the compiler to identify endianess and verify XTENSA_{BIG,LITTLE}_ENDIAN
+ ifndef IGNORE_ENDIANESS
CC_ENDIAN_STRING := $(shell echo 'main(){}' | $(CC) -E -dM -xc - | grep __XTENSA_EB__)
ifeq "$(CC_ENDIAN_STRING)" ""
ifeq "$(XTENSA_LITTLE_ENDIAN)" "n"
! $(error Your compiler <$(CC)> and processor configuration <$(PCONF)> mismatch on endianess, use "make IGNORE_ENDIANESS=1" to ignore)
! endif
! endif
! ifneq "$(CC_ENDIAN_STRING)" ""
! ifeq "$(XTENSA_LITTLE_ENDIAN)" "y"
! $(error Your compiler <$(CC)> and processor configuration <$(PCONF)> mismatch on endianess, use "make IGNORE_ENDIANESS=1" to ignore)
! endif
endif
endif
# The "tools" subdirectory needs to be built before all others.
***************
*** 135,138 ****
--- 156,163 ----
(cd include/asm-xtensa; ln -sf platform-$(PLATFORM) platform)
+ configsymlinks:
+ $(RM) include/asm-xtensa/xtensa/config
+ (cd include/asm-xtensa/xtensa; ln -sf config-$(XTENSA_CONFIG) config)
+
archclean:
@$(MAKEBOOT) clean
***************
*** 142,146 ****
@/bin/true
! archdep:archsymlinks
# @$(MAKEBOOT) fastdep
@$(MAKETOOLS) fastdep
--- 167,171 ----
@/bin/true
! archdep:archsymlinks configsymlinks
# @$(MAKEBOOT) fastdep
@$(MAKETOOLS) fastdep
Index: config.in
===================================================================
RCS file: /cvsroot/xtensa/linux/arch/xtensa/config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.in 19 Sep 2002 07:06:10 -0000 1.2
--- config.in 23 Oct 2002 20:53:18 -0000 1.3
***************
*** 27,33 ****
comment 'Platform dependent support'
! choice 'Xtensa system type' \
! "ISS CONFIG_XTENSA_ISS \
! XT2000 CONFIG_XTENSA_XT2000" ISS
bool 'Auto calibration of the CPU clock rate' CONFIG_XTENSA_CALIBRATE
--- 27,39 ----
comment 'Platform dependent support'
! choice 'Xtensa Processor Configuration' \
! "linux_be CONFIG_XTENSA_CONFIG_LINUX_BE \
! linux_le CONFIG_XTENSA_CONFIG_LINUX_LE \
! linux_test CONFIG_XTENSA_CONFIG_LINUX_TEST" linux_be
!
! choice 'Xtensa System Type' \
! "ISS CONFIG_XTENSA_PLATFORM_ISS \
! XT2000 CONFIG_XTENSA_PLATFORM_XT2000" ISS
!
bool 'Auto calibration of the CPU clock rate' CONFIG_XTENSA_CALIBRATE
***************
*** 38,42 ****
bool 'IEEE FPU emulation' CONFIG_IEEEFPU_EMULATION
! if [ "$CONFIG_XTENSA_ISS" = "y" ]; then
define_bool CONFIG_SERIAL_CONSOLE y
fi
--- 44,48 ----
bool 'IEEE FPU emulation' CONFIG_IEEEFPU_EMULATION
! if [ "$CONFIG_XTENSA_PLATFORM_ISS" = "y" ]; then
define_bool CONFIG_SERIAL_CONSOLE y
fi
***************
*** 52,56 ****
define_bool CONFIG_MCA n
! if [ "$CONFIG_XTENSA_ISS" != "y" ]; then
define_bool CONFIG_PCI y
fi
--- 58,62 ----
define_bool CONFIG_MCA n
! if [ "$CONFIG_XTENSA_PLATFORM_ISS" != "y" ]; then
define_bool CONFIG_PCI y
fi
|