From 708a87c51e6acfa1e2be90e2d1a1e12c272e5170 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 20 Nov 2001 18:55:30 +0000 Subject: 2001-11-16 Ralf Corsepius * custom/eth_comm.cfg: Reflect changes to eth_comm/configure.ac. * custom/mbx8xx.cfg: Reflect changes to mbx8xx/configure.ac. * custom/mbx860_005b.cfg: Ditto. * custom/mpc8620ads.cfg: Reflect changes to mpc8620/configure.ac. --- make/ChangeLog | 8 +++++ make/custom/eth_comm.cfg | 6 ---- make/custom/mbx860_005b.cfg | 12 -------- make/custom/mbx8xx.cfg | 72 --------------------------------------------- make/custom/mpc8260ads.cfg | 33 --------------------- 5 files changed, 8 insertions(+), 123 deletions(-) diff --git a/make/ChangeLog b/make/ChangeLog index 514dbd32bb..6717014d4e 100644 --- a/make/ChangeLog +++ b/make/ChangeLog @@ -1,4 +1,12 @@ +2001-11-16 Ralf Corsepius + + * custom/eth_comm.cfg: Reflect changes to eth_comm/configure.ac. + * custom/mbx8xx.cfg: Reflect changes to mbx8xx/configure.ac. + * custom/mbx860_005b.cfg: Ditto. + * custom/mpc8620ads.cfg: Reflect changes to mpc8620/configure.ac. + + 2001-11-15 Ralf Corsepius * custom/gensh1.cfg: remove make-target-options. diff --git a/make/custom/eth_comm.cfg b/make/custom/eth_comm.cfg index 39d54f52be..f91edfaa54 100644 --- a/make/custom/eth_comm.cfg +++ b/make/custom/eth_comm.cfg @@ -16,10 +16,6 @@ RTEMS_PPC_EXCEPTION_PROCESSING_MODEL=new # This section makes the target dependent options file. -# PPC_VECTOR_FILE_BASE (PowerPC) -# This defines the base address of the exception table. -# NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100 -# # PPC_ABI (PowerPC) # This defines the calling convention (Application Binary Interface) # used in this configuration. EABI is the only one supported. @@ -36,10 +32,8 @@ define make-target-options @echo "#endif" >>$@ @echo "#define mpc$(CPU_TYPE) 1" >>$@ @echo >>$@ - @echo "#define PPC_VECTOR_FILE_BASE 0x0000" >>$@ @echo "#define PPC_ABI PPC_ABI_EABI" >>$@ @echo "#define PPC_ASM PPC_ASM_ELF" >>$@ - @echo "#define PPC_USE_SPRG 1" >>$@ endef # This contains the compiler options necessary to select the CPU model diff --git a/make/custom/mbx860_005b.cfg b/make/custom/mbx860_005b.cfg index 8b766373d7..5412fd9ab1 100644 --- a/make/custom/mbx860_005b.cfg +++ b/make/custom/mbx860_005b.cfg @@ -21,19 +21,7 @@ define make-target-options @echo "#endif" >>$@ @echo "#define mpc$(CPU_TYPE) 1" >>$@ @echo >>$@ - @echo "#define NVRAM_CONFIGURE 0" >>$@ - @echo "#define UARTS_USE_TERMIOS 1" >>$@ - @echo "#define CONSOLE_MINOR SMC1_MINOR" >>$@ - @echo "#define UARTS_IO_MODE 0" >>$@ - @echo "#define UARTS_USE_INTERRUPTS 0" >>$@ - @echo "#define PRINTK_MINOR SMC1_MINOR" >>$@ - @echo "#define PRINTK_IO_MODE 0" >>$@ - @echo "/*#define EPPCBUG_SMC1 0*/" >>$@ - @echo "/* #define EPPCBUG_VECTORS 1*/" >>$@ @echo "#define INSTRUCTION_CACHE_ENABLE 1" >>$@ @echo "#define DATA_CACHE_ENABLE 1" >>$@ @echo >>$@ - @echo "#define PPC_VECTOR_FILE_BASE 0x0000" >>$@ - @echo "/*#define PPC_USE_DATA_CACHE 1*/" >>$@ - @echo >>$@ endef diff --git a/make/custom/mbx8xx.cfg b/make/custom/mbx8xx.cfg index 28e52739f3..4d8d4ed9c0 100644 --- a/make/custom/mbx8xx.cfg +++ b/make/custom/mbx8xx.cfg @@ -64,57 +64,6 @@ endif # mbx821 # # MBX8xx-specific options: # -# NVRAM_CONFIGURE -# Define to 1 if you want the console driver, network driver and caches -# configured at boot time from parameters stored in NVRAM. If set to 1, -# most parameters below are ignored during the build. If not set to 1, -# then the console driver is configured at build time, the network host -# information is obtained from application supplied data structures, and -# the caches are configured at boot time based on the information supplied -# in this file. -# -# UARTS_USE_TERMIOS -# Define to 1 if you want termios support for every port. -# Termios support is independent of the choice of UART I/O mode. -# -# CONSOLE_MINOR (BSP--console driver) -# Must be defined to be one of SMC1_MINOR, SMC2_MINOR, SCC2_MINOR, -# SCC3_MINOR, or SCC4_MINOR. Determines which device will be registered -# as /dev/console. -# -# UARTS_IO_MODE (BSP--console driver) -# Define to 0 or 1 if you want polled I/O performed by RTEMS. -# Define to 1 if you want interrupt-driven performed by RTEMS. -# Define to 2 if you want polled I/O performed by EPPCBug. -# There is no provision to have a mix of interrupt-driven and polled I/O -# ports, except that the printk port may use a different mode from the -# other ports. If this is done, do not open the printk port from an RTEMS -# application. With EPPCBug 1.1, if mode 2 is selected, CONSOLE_MINOR must -# be set to SMC1_MINOR. This is a deficiency of the firmware: it does not -# perform serial I/O on any port other than its default debug port, which -# must be SMC1. -# -# PRINTK_MINOR (BSP--console driver) -# Must be defined to be one of SMC1_MINOR, SMC2_MINOR, SCC2_MINOR, -# SCC3_MINOR, or SCC4_MINOR. Determines which device is used for output -# by printk(). If the port that printk() uses is also used for other I/O -# (e.g. if PRINTK_MINOR == CONSOLE_MINOR), then both ports should use -# the same type of I/O, otherwise the drivers will likely conflict with -# each other. -# -# PRINTK_IO_MODE (BSP--console driver) -# Define to 0 or 1 if you want polled I/O performed by RTEMS. -# Define to 2 if you want polled I/O performed by EPPCBug. -# The printk() port is not configured to use termios. With EPPCBug 1.1, -# if mode 2 is selected, PRINTK_MINOR must be set to SMC1_MINOR. -# This is a deficiency of the firmware: it does not perform serial I/O -# on any port other than its default debug port, which must be SMC1. -# Printk always uses polled output. -# -# EPPCBUG_SMC1 (BSP--console driver) -# If defined, SMC1 is in use by EPPC-Bug. The console driver will not -# re-initialize that port. -# # INSTRUCTION_CACHE_ENABLE (BSP--RTEMS) # If defined, the instruction cache will be enabled after address translation # is turned on. @@ -123,16 +72,6 @@ endif # mbx821 # If defined, the data cache will be enabled after address translation # is turned on. # -# EPPCBUG_VECTORS (BSP--RTEMS) -# If defined, vectors branch to EPPCBug, except the following: -# 0x500 (external interrupt), 0x900 (decrementer). -# -# PowerPC-specific options: -# -# PPC_USE_DATA_CACHE (RTEMS PowerPC port) -# If defined, then the PowerPC specific code in RTEMS will use -# data cache instructions to optimize the context switch code. -# This code can conflict with debuggers or emulators. define make-target-options @echo "#ifdef mpc$(CPU_TYPE)" >>$@ @@ -140,20 +79,9 @@ define make-target-options @echo "#endif" >>$@ @echo "#define mpc$(CPU_TYPE) 1" >>$@ @echo >>$@ - @echo "#define NVRAM_CONFIGURE 1" >>$@ - @echo "#define UARTS_USE_TERMIOS 0" >>$@ - @echo "#define CONSOLE_MINOR SMC2_MINOR" >>$@ - @echo "#define UARTS_IO_MODE 0" >>$@ - @echo "#define PRINTK_MINOR SMC2_MINOR" >>$@ - @echo "#define PRINTK_IO_MODE 0" >>$@ - @echo "#define EPPCBUG_SMC1 1" >>$@ - @echo "#define EPPCBUG_VECTORS 1" >>$@ @echo "#define INSTRUCTION_CACHE_ENABLE 1" >>$@ @echo "#define DATA_CACHE_ENABLE 1" >>$@ @echo >>$@ - @echo "#define PPC_VECTOR_FILE_BASE 0x0000" >>$@ - @echo "#define PPC_USE_DATA_CACHE 1" >>$@ - @echo >>$@ endef # This contains the compiler options necessary to select the CPU model diff --git a/make/custom/mpc8260ads.cfg b/make/custom/mpc8260ads.cfg index 5c31c7722f..ae93b02384 100644 --- a/make/custom/mpc8260ads.cfg +++ b/make/custom/mpc8260ads.cfg @@ -13,15 +13,8 @@ CPU_TYPE=8260 # This is the actual bsp directory used during the build process. RTEMS_BSP_FAMILY=mpc8260ads -#CPU_DEFINES=-DPPC_VECTOR_FILE_BASE=0x00000000 -CPU_DEFINES= - # This section makes the target dependent options file. -# PPC_VECTOR_FILE_BASE (PowerPC) -# This defines the base address of the exception table. -# NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100 -# # PPC_ABI (PowerPC) # This defines the calling convention (Application Binary Interface) # used in this configuration. EABI is the only one supported. @@ -37,38 +30,12 @@ define make-target-options @echo "#endif" >>$@ @echo "#define mpc$(CPU_TYPE) 1" >>$@ @echo >>$@ - @echo "#define NVRAM_CONFIGURE 0" >>$@ - @echo "#define UARTS_USE_TERMIOS 0" >>$@ - @echo "#define CONSOLE_MINOR SCC2_MINOR" >>$@ - @echo "#define UARTS_IO_MODE 0" >>$@ - @echo "#define PRINTK_MINOR SCC2_MINOR" >>$@ - @echo "#define PRINTK_IO_MODE 0" >>$@ - @echo >>$@ - @echo "#define PPC_VECTOR_FILE_BASE 0x0000" >>$@ @echo "#define PPC_ABI PPC_ABI_EABI" >>$@ @echo "#define PPC_ASM PPC_ASM_ELF" >>$@ @echo "#define INSTRUCTION_CACHE_ENABLE 0" >>$@ @echo "#define DATA_CACHE_ENABLE 0" >>$@ endef -# This section makes the target dependent options file. - -# NDEBUG (C library) -# if defined asserts do not generate code. This is commonly used -# as a command line option. -# -# RTEMS_TEST_NO_PAUSE (RTEMS tests) -# do not pause between screens of output in the rtems tests -# -# RTEMS_DEBUG (RTEMS) -# If defined, debug checks in RTEMS and support library code are enabled. - -#define make-target-options -# @echo "/* #define NDEBUG 1 */ " >>$@ -# @echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@ -# @echo "/* #define RTEMS_DEBUG 1 */" >>$@ -#endef - # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. # -- cgit v1.2.3