Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cf975e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'cris' of git://www.jni.nu/cris 

* 'cris' of git://www.jni.nu/cris: (158 commits)
  CRIS v32: Remove hwregs/timer_defs.h, it is now architecture specific.
  CRIS v32: Change drivers/i2c.c locking.
  CRIS v32: Rewrite ARTPEC-3 gpio driver to avoid volatiles and general cleanup.
  CRIS: Add new timerfd syscall entries.
  MAINTAINERS: Add my information for the CRIS port.
  CRIS v32: Correct spelling of bandwidth in function name.
  CRIS v32: Clean up nandflash.c for ARTPEC-3 and ETRAX FS.
  CRIS v10: Cleanup of drivers/gpio.c
  CRIS v10: drivers/net/cris/eth_v10.c rename LED defines to CRIS_LED to avoid name clash.
  CRIS: Make io_pwm_set_period members unsigned in etraxgpio.h
  CRIS: Move ETRAX_AXISFLASHMAP to common Kconfig file.
  CRIS: Drop regs parameter from call to profile_tick in kernel/time.c
  CRIS v32: Fix minor formatting issue in mach-a3/io.c
  CRIS v32: Initialize GIO even if we're rambooting in kernel/head.S
  CRIS v32: Remove kernel/arbiter.c, it now exists in machine dependent directory.
  CRIS v32: Minor changes to avoid errors in asm-cris/arch-v32/hwregs/reg_rdwr.h
  CRIS v32: arch-v32/hwregs/intr_vect_defs.h moved to machine dependent directory.
  CRIS v32: Correct offset for TASK_pid in asm-cris/arch-v32/offset.h
  CRIS v32: Move register map header to machine dependent directory.
  CRIS v32: Let compiler know that memory is clobbered after a break op.
  ...
parents 03054de1 bc10ac3f

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,8 @@ S: Orphan 
CRIS PORT

P:	Mikael Starvik

M:	starvik@axis.com

P:	Jesper Nilsson

M:	jesper.nilsson@axis.com

L:	dev-etrax@axis.com

W:	http://developer.axis.com

S:	Maintained

arch/cris/Kconfig

+498 −40
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ config ZONE_DMA 
	bool

	default y



config NO_DMA

	bool

	default y



config RWSEM_GENERIC_SPINLOCK

	bool

	default y
@@ -24,6 +20,10 @@ config RWSEM_GENERIC_SPINLOCK 
config RWSEM_XCHGADD_ALGORITHM

	bool



config GENERIC_IOMAP

       bool

       default y



config ARCH_HAS_ILOG2_U32

	bool

	default n
@@ -44,13 +44,13 @@ config GENERIC_CALIBRATE_DELAY 
	bool

	default y



config IRQ_PER_CPU

	bool

	default y



config NO_IOPORT

	def_bool y



config FORCE_MAX_ZONEORDER

	int

	default 6



config CRIS

	bool

	default y
@@ -97,17 +97,15 @@ config ETRAX_FAST_TIMER 
	 timers).

	 This is needed if CONFIG_ETRAX_SERIAL_FAST_TIMER is enabled.



config PREEMPT

	bool "Preemptible Kernel"

config ETRAX_KMALLOCED_MODULES

	bool "Enable module allocation with kmalloc"

	help

	  This option reduces the latency of the kernel when reacting to

	  real-time or interactive events by allowing a low priority process to

	  be preempted even if it is in kernel mode executing a system call.

	  This allows applications to run more reliably even when the system is

	  under load.

	  Enable module allocation with kmalloc instead of vmalloc.



	  Say Y here if you are building a kernel for a desktop, embedded

	  or real-time system.  Say N if you are unsure.

config OOM_REBOOT

       bool "Enable reboot at out of memory"



source "kernel/Kconfig.preempt"



source mm/Kconfig
@@ -134,24 +132,124 @@ config SVINTO_SIM 
	help

	  Support the xsim ETRAX Simulator.



config ETRAXFS

	bool "ETRAX-FS-V32"

	help

	  Support CRIS V32.



config CRIS_MACH_ARTPEC3

        bool "ARTPEC-3"

        help

          Support Axis ARTPEC-3.



endchoice



config ETRAX_VCS_SIM

	bool "VCS Simulator"

	help

	  Setup hardware to be run in the VCS simulator.



config ETRAX_ARCH_V10

       bool

       default y if ETRAX100LX || ETRAX100LX_V2

       default n if !(ETRAX100LX || ETRAX100LX_V2)



config ETRAX_ARCH_V32

       bool

       default y if (ETRAXFS || CRIS_MACH_ARTPEC3)

       default n if !(ETRAXFS || CRIS_MACH_ARTPEC3)



config ETRAX_DRAM_SIZE

	int "DRAM size (dec, in MB)"

	default "8"

	help

	  Size of DRAM (decimal in MB) typically 2, 8 or 16.



config ETRAX_VMEM_SIZE

       int "Video memory size (dec, in MB)"

       depends on ETRAX_ARCH_V32 && !ETRAXFS

       default 8 if !ETRAXFS

       help

	Size of Video accessible memory (decimal, in MB).



config ETRAX_FLASH_BUSWIDTH

	int "Buswidth of flash in bytes"

	int "Buswidth of NOR flash in bytes"

	default "2"

	help

	  Width in bytes of the Flash bus (1, 2 or 4). Is usually 2.

	  Width in bytes of the NOR Flash bus (1, 2 or 4). Is usually 2.



config ETRAX_NANDFLASH_BUSWIDTH

	int "Buswidth of NAND flash in bytes"

	default "1"

	help

	  Width in bytes of the NAND flash (1 or 2).



config ETRAX_FLASH1_SIZE

       int "FLASH1 size (dec, in MB. 0 = Unknown)"

       default "0"



choice

	prompt "Product debug-port"

	default ETRAX_DEBUG_PORT0



config ETRAX_DEBUG_PORT0

	bool "Serial-0"

	help

	  Choose a serial port for the ETRAX debug console.  Default to

	  port 0.



config ETRAX_DEBUG_PORT1

	bool "Serial-1"

	help

	  Use serial port 1 for the console.



config ETRAX_DEBUG_PORT2

	bool "Serial-2"

	help

	  Use serial port 2 for the console.



config ETRAX_DEBUG_PORT3

	bool "Serial-3"

	help

	  Use serial port 3 for the console.



config ETRAX_DEBUG_PORT_NULL

	bool "disabled"

	help

	  Disable serial-port debugging.



endchoice



choice

	prompt "Kernel GDB port"

	depends on ETRAX_KGDB

	default ETRAX_KGDB_PORT0

	help

	  Choose a serial port for kernel debugging.  NOTE: This port should

	  not be enabled under Drivers for built-in interfaces (as it has its

	  own initialization code) and should not be the same as the debug port.



config ETRAX_KGDB_PORT0

	bool "Serial-0"

	help

	  Use serial port 0 for kernel debugging.



config ETRAX_KGDB_PORT1

	bool "Serial-1"

	help

	  Use serial port 1 for kernel debugging.



config ETRAX_KGDB_PORT2

	bool "Serial-2"

	help

	  Use serial port 2 for kernel debugging.



config ETRAX_KGDB_PORT3

	bool "Serial-3"

	help

	  Use serial port 3 for kernel debugging.



endchoice



source arch/cris/arch-v10/Kconfig

source arch/cris/arch-v32/Kconfig
@@ -165,6 +263,387 @@ menu "Drivers for built-in interfaces" 
source arch/cris/arch-v10/drivers/Kconfig

source arch/cris/arch-v32/drivers/Kconfig



config ETRAX_AXISFLASHMAP

	bool "Axis flash-map support"

	select MTD

	select MTD_CFI

	select MTD_CFI_AMDSTD

	select MTD_JEDECPROBE if ETRAX_ARCH_V32

	select MTD_CHAR

	select MTD_BLOCK

	select MTD_PARTITIONS

	select MTD_CONCAT

	select MTD_COMPLEX_MAPPINGS

	help

	  This option enables MTD mapping of flash devices.  Needed to use

	  flash memories.  If unsure, say Y.



config ETRAX_RTC

	bool "Real Time Clock support"

	depends on ETRAX_I2C

	help

	  Enables drivers for the Real-Time Clock battery-backed chips on

	  some products. The kernel reads the time when booting, and

	  the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a

	  rtc_time struct (see <file:include/asm-cris/rtc.h>) on the /dev/rtc

	  device.  You can check the time with cat /proc/rtc, but

	  normal time reading should be done using libc function time and

	  friends.



choice

	prompt "RTC chip"

	depends on ETRAX_RTC

	default ETRAX_PCF8563 if ETRAX_ARCH_V32

	default ETRAX_DS1302 if ETRAX_ARCH_V10



config ETRAX_DS1302

	depends on ETRAX_ARCH_V10

	bool "DS1302"

	help

	  Enables the driver for the DS1302 Real-Time Clock battery-backed

	  chip on some products.



config ETRAX_PCF8563

	bool "PCF8563"

	help

	  Enables the driver for the PCF8563 Real-Time Clock battery-backed

	  chip on some products.



endchoice



config ETRAX_SYNCHRONOUS_SERIAL

	bool "Synchronous serial-port support"

	help

	  Select this to enable the synchronous serial port driver.



config ETRAX_SYNCHRONOUS_SERIAL_PORT0

	bool "Synchronous serial port 0 enabled"

	depends on ETRAX_SYNCHRONOUS_SERIAL

	help

	  Enabled synchronous serial port 0.



config ETRAX_SYNCHRONOUS_SERIAL0_DMA

	bool "Enable DMA on synchronous serial port 0."

	depends on ETRAX_SYNCHRONOUS_SERIAL_PORT0

	help

	  A synchronous serial port can run in manual or DMA mode.

	  Selecting this option will make it run in DMA mode.



config ETRAX_SYNCHRONOUS_SERIAL_PORT1

	bool "Synchronous serial port 1 enabled"

	depends on ETRAX_SYNCHRONOUS_SERIAL && (ETRAXFS || ETRAX_ARCH_V10)

	help

	  Enabled synchronous serial port 1.



config ETRAX_SYNCHRONOUS_SERIAL1_DMA

	bool "Enable DMA on synchronous serial port 1."

	depends on ETRAX_SYNCHRONOUS_SERIAL_PORT1

	help

	  A synchronous serial port can run in manual or DMA mode.

	  Selecting this option will make it run in DMA mode.



choice

	prompt "Network LED behavior"

	depends on ETRAX_ETHERNET

	default ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY



config ETRAX_NETWORK_LED_ON_WHEN_LINK

	bool "LED_on_when_link"

	help

	  Selecting LED_on_when_link will light the LED when there is a

	  connection and will flash off when there is activity.



	  Selecting LED_on_when_activity will light the LED only when

	  there is activity.



	  This setting will also affect the behaviour of other activity LEDs

	  e.g. Bluetooth.



config ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY

	bool "LED_on_when_activity"

	help

	  Selecting LED_on_when_link will light the LED when there is a

	  connection and will flash off when there is activity.



	  Selecting LED_on_when_activity will light the LED only when

	  there is activity.



	  This setting will also affect the behaviour of other activity LEDs

	  e.g. Bluetooth.



endchoice



choice

	prompt "Ser0 DMA out channel"

	depends on ETRAX_SERIAL_PORT0

	default ETRAX_SERIAL_PORT0_DMA6_OUT if ETRAX_ARCH_V32

	default ETRAX_SERIAL_PORT0_NO_DMA_OUT if ETRAX_ARCH_V10



config ETRAX_SERIAL_PORT0_NO_DMA_OUT

	bool "Ser0 uses no DMA for output"

	help

	  Do not use DMA for ser0 output.



config ETRAX_SERIAL_PORT0_DMA6_OUT

	bool "Ser0 uses DMA6 for output"

	depends on ETRAXFS

	help

	  Enables the DMA6 output channel for ser0 (ttyS0).

	  If you do not enable DMA, an interrupt for each character will be

	  used when transmitting data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



config ETRAX_SERIAL_PORT0_DMA0_OUT

	bool "Ser0 uses DMA0 for output"

	depends on CRIS_MACH_ARTPEC3

	help

	  Enables the DMA0 output channel for ser0 (ttyS0).

	  If you do not enable DMA, an interrupt for each character will be

	  used when transmitting data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



endchoice



choice

	prompt "Ser0 DMA in channel "

	depends on ETRAX_SERIAL_PORT0

	default ETRAX_SERIAL_PORT0_NO_DMA_IN if ETRAX_ARCH_V32

	default ETRAX_SERIAL_PORT0_DMA7_IN if ETRAX_ARCH_V10

	help

	  What DMA channel to use for ser0.



config ETRAX_SERIAL_PORT0_NO_DMA_IN

	bool "Ser0 uses no DMA for input"

	help

	  Do not use DMA for ser0 input.



config ETRAX_SERIAL_PORT0_DMA7_IN

	bool "Ser0 uses DMA7 for input"

	depends on ETRAXFS

	help

	  Enables the DMA7 input channel for ser0 (ttyS0).

	  If you do not enable DMA, an interrupt for each character will be

	  used when receiving data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



config ETRAX_SERIAL_PORT0_DMA1_IN

	bool "Ser0 uses DMA1 for input"

	depends on CRIS_MACH_ARTPEC3

	help

	  Enables the DMA1 input channel for ser0 (ttyS0).

	  If you do not enable DMA, an interrupt for each character will be

	  used when receiveing data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



endchoice



choice

	prompt "Ser1 DMA in channel "

	depends on ETRAX_SERIAL_PORT1

	default ETRAX_SERIAL_PORT1_NO_DMA_IN if ETRAX_ARCH_V32

	default ETRAX_SERIAL_PORT1_DMA9_IN if ETRAX_ARCH_V10

	help

	  What DMA channel to use for ser1.



config ETRAX_SERIAL_PORT1_NO_DMA_IN

	bool "Ser1 uses no DMA for input"

	help

	  Do not use DMA for ser1 input.



config ETRAX_SERIAL_PORT1_DMA5_IN

	bool "Ser1 uses DMA5 for input"

	depends on ETRAX_ARCH_V32

	help

	  Enables the DMA5 input channel for ser1 (ttyS1).

	  If you do not enable DMA, an interrupt for each character will be

	  used when receiving data.

	  Normally you want this on, unless you use the DMA channel for

	  something else.



config ETRAX_SERIAL_PORT1_DMA9_IN

	depends on ETRAX_ARCH_V10

	bool "Ser1 uses DMA9 for input"



endchoice





choice

	prompt "Ser1 DMA out channel"

	depends on ETRAX_SERIAL_PORT1

	default ETRAX_SERIAL_PORT1_NO_DMA_OUT if ETRAX_ARCH_V32

	default ETRAX_SERIAL_PORT1_DMA8_OUT if ETRAX_ARCH_V10

	help

	  What DMA channel to use for ser1.



config ETRAX_SERIAL_PORT1_NO_DMA_OUT

	bool "Ser1 uses no DMA for output"

	help

	  Do not use DMA for ser1 output.



config ETRAX_SERIAL_PORT1_DMA8_OUT

	depends on ETRAX_ARCH_V10

	bool "Ser1 uses DMA8 for output"



config ETRAX_SERIAL_PORT1_DMA4_OUT

	depends on ETRAX_ARCH_V32

	bool "Ser1 uses DMA4 for output"

	help

	  Enables the DMA4 output channel for ser1 (ttyS1).

	  If you do not enable DMA, an interrupt for each character will be

	  used when transmitting data.

	  Normally you want this on, unless you use the DMA channel for

	  something else.



endchoice



choice

	prompt "Ser2 DMA out channel"

	depends on ETRAX_SERIAL_PORT2

	default ETRAX_SERIAL_PORT2_NO_DMA_OUT if ETRAX_ARCH_V32

	default ETRAX_SERIAL_PORT2_DMA2_OUT if ETRAX_ARCH_V10



config ETRAX_SERIAL_PORT2_NO_DMA_OUT

	bool "Ser2 uses no DMA for output"

	help

	  Do not use DMA for ser2 output.



config ETRAX_SERIAL_PORT2_DMA2_OUT

	bool "Ser2 uses DMA2 for output"

	depends on ETRAXFS || ETRAX_ARCH_V10

	help

	  Enables the DMA2 output channel for ser2 (ttyS2).

	  If you do not enable DMA, an interrupt for each character will be

	  used when transmitting data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



config ETRAX_SERIAL_PORT2_DMA6_OUT

	bool "Ser2 uses DMA6 for output"

	depends on CRIS_MACH_ARTPEC3

	help

	  Enables the DMA6 output channel for ser2 (ttyS2).

	  If you do not enable DMA, an interrupt for each character will be

	  used when transmitting data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



endchoice



choice

	prompt "Ser2 DMA in channel"

	depends on ETRAX_SERIAL_PORT2

	default ETRAX_SERIAL_PORT2_NO_DMA_IN if ETRAX_ARCH_V32

	default ETRAX_SERIAL_PORT2_DMA3_IN if ETRAX_ARCH_V10

	help

	  What DMA channel to use for ser2.



config ETRAX_SERIAL_PORT2_NO_DMA_IN

	bool "Ser2 uses no DMA for input"

	help

	  Do not use DMA for ser2 input.



config ETRAX_SERIAL_PORT2_DMA3_IN

	bool "Ser2 uses DMA3 for input"

	depends on ETRAXFS || ETRAX_ARCH_V10

	help

	  Enables the DMA3 input channel for ser2 (ttyS2).

	  If you do not enable DMA, an interrupt for each character will be

	  used when receiving data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



config ETRAX_SERIAL_PORT2_DMA7_IN

	bool "Ser2 uses DMA7 for input"

	depends on CRIS_MACH_ARTPEC3

	help

	  Enables the DMA7 input channel for ser2 (ttyS2).

	  If you do not enable DMA, an interrupt for each character will be

	  used when receiveing data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



endchoice



choice

	prompt "Ser3 DMA in channel"

	depends on ETRAX_SERIAL_PORT3

	default ETRAX_SERIAL_PORT3_NO_DMA_IN if ETRAX_ARCH_V32

	default ETRAX_SERIAL_PORT3_DMA5_IN if ETRAX_ARCH_V10

	help

	  What DMA channel to use for ser3.



config ETRAX_SERIAL_PORT3_NO_DMA_IN

	bool "Ser3 uses no DMA for input"

	help

	  Do not use DMA for ser3 input.



config ETRAX_SERIAL_PORT3_DMA5_IN

	depends on ETRAX_ARCH_V10

	bool "DMA 5"



config ETRAX_SERIAL_PORT3_DMA9_IN

	bool "Ser3 uses DMA9 for input"

	depends on ETRAXFS

	help

	  Enables the DMA9 input channel for ser3 (ttyS3).

	  If you do not enable DMA, an interrupt for each character will be

	  used when receiving data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



config ETRAX_SERIAL_PORT3_DMA3_IN

	bool "Ser3 uses DMA3 for input"

	depends on CRIS_MACH_ARTPEC3

	help

	  Enables the DMA3 input channel for ser3 (ttyS3).

	  If you do not enable DMA, an interrupt for each character will be

	  used when receiveing data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



endchoice



choice

	prompt "Ser3 DMA out channel"

	depends on ETRAX_SERIAL_PORT3

	default ETRAX_SERIAL_PORT3_NO_DMA_OUT if ETRAX_ARCH_V32

	default ETRAX_SERIAL_PORT3_DMA4_OUT if ETRAX_ARCH_V10



config ETRAX_SERIAL_PORT3_NO_DMA_OUT

	bool "Ser3 uses no DMA for output"

	help

	  Do not use DMA for ser3 output.



config ETRAX_SERIAL_PORT3_DMA4_OUT

	depends on ETRAX_ARCH_V10

	bool "DMA 4"



config ETRAX_SERIAL_PORT3_DMA8_OUT

	bool "Ser3 uses DMA8 for output"

	depends on ETRAXFS

	help

	  Enables the DMA8 output channel for ser3 (ttyS3).

	  If you do not enable DMA, an interrupt for each character will be

	  used when transmitting data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



config ETRAX_SERIAL_PORT3_DMA2_OUT

	bool "Ser3 uses DMA2 for output"

	depends on CRIS_MACH_ARTPEC3

	help

	  Enables the DMA2 output channel for ser3 (ttyS3).

	  If you do not enable DMA, an interrupt for each character will be

	  used when transmitting data.

	  Normally you want to use DMA, unless you use the DMA channel for

	  something else.



endchoice



endmenu



source "drivers/base/Kconfig"
@@ -178,22 +657,10 @@ source "drivers/pnp/Kconfig" 


source "drivers/block/Kconfig"



source "drivers/md/Kconfig"



source "drivers/ide/Kconfig"



source "drivers/scsi/Kconfig"



source "drivers/ieee1394/Kconfig"



source "drivers/message/i2o/Kconfig"



source "drivers/net/Kconfig"



source "drivers/isdn/Kconfig"



source "drivers/telephony/Kconfig"



source "drivers/i2c/Kconfig"



source "drivers/rtc/Kconfig"
@@ -205,17 +672,8 @@ source "drivers/input/Kconfig" 


source "drivers/char/Kconfig"



#source drivers/misc/Config.in

source "drivers/media/Kconfig"



source "fs/Kconfig"



source "sound/Kconfig"



source "drivers/pcmcia/Kconfig"



source "drivers/pci/Kconfig"



source "drivers/usb/Kconfig"



source "arch/cris/Kconfig.debug"

arch/cris/Makefile

+70 −69
Original line number Diff line number Diff line 
# $Id: Makefile,v 1.28 2005/03/17 10:44:37 larsv Exp $

#

# cris/Makefile

#

# This file is included by the global makefile so that you can add your own
@@ -10,28 +10,36 @@ 
# License.  See the file "COPYING" in the main directory of this archive

# for more details.



# A bug in ld prevents us from having a (constant-value) symbol in a

# "ORIGIN =" or "LENGTH =" expression.



arch-y := v10

arch-$(CONFIG_ETRAX_ARCH_V10) := v10

arch-$(CONFIG_ETRAX_ARCH_V32) := v32



# No config avaiable for make clean etc

# No config available for make clean etc

mach-y := fs

mach-$(CONFIG_CRIS_MACH_ARTPEC3) := a3

mach-$(CONFIG_ETRAXFS) := fs



ifneq ($(arch-y),)

SARCH := arch-$(arch-y)

else

SARCH :=

endif



ifneq ($(mach-y),)

MACH := mach-$(mach-y)

else

MACH :=

endif



LD = $(CROSS_COMPILE)ld -mcrislinux



OBJCOPYFLAGS := -O binary -R .note -R .comment -S



CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)

KBUILD_AFLAGS += -mlinux



KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe

KBUILD_AFLAGS += -mlinux -march=$(arch-y) -Iinclude/asm/arch/mach -Iinclude/asm/arch



KBUILD_CFLAGS += -mlinux -march=$(arch-y) -pipe -Iinclude/asm/arch/mach -Iinclude/asm/arch



ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS := $(subst -fomit-frame-pointer,,$(KBUILD_CFLAGS)) -g
@@ -44,6 +52,9 @@ LIBGCC = $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libgcc.a) 


core-y		+= arch/$(ARCH)/kernel/ arch/$(ARCH)/mm/

core-y		+= arch/$(ARCH)/$(SARCH)/kernel/ arch/$(ARCH)/$(SARCH)/mm/

ifdef CONFIG_ETRAX_ARCH_V32

core-y		+= arch/$(ARCH)/$(SARCH)/$(MACH)/

endif

drivers-y	+= arch/$(ARCH)/$(SARCH)/drivers/

libs-y		+= arch/$(ARCH)/$(SARCH)/lib/ $(LIBGCC)
@@ -52,79 +63,69 @@ SRC_ARCH = $(srctree)/arch/$(ARCH) 
# cris object files path

OBJ_ARCH              = $(objtree)/arch/$(ARCH)



target_boot_arch_dir  = $(OBJ_ARCH)/$(SARCH)/boot

target_boot_dir       = $(OBJ_ARCH)/boot

src_boot_dir          = $(SRC_ARCH)/boot

target_compressed_dir = $(OBJ_ARCH)/boot/compressed

src_compressed_dir    = $(SRC_ARCH)/boot/compressed

target_rescue_dir     = $(OBJ_ARCH)/boot/rescue

src_rescue_dir        = $(SRC_ARCH)/boot/rescue



export target_boot_arch_dir target_boot_dir src_boot_dir target_compressed_dir src_compressed_dir target_rescue_dir src_rescue_dir



vmlinux.bin: vmlinux

	$(OBJCOPY) $(OBJCOPYFLAGS) vmlinux vmlinux.bin



timage: vmlinux.bin

	cat vmlinux.bin cramfs.img >timage



simimage: timage

	cp vmlinux.bin simvmlinux.bin



# the following will remake timage without compiling the kernel

# it does of course require that all object files exist...



cramfs:

## cramfs      - Creates a cramfs image

	mkcramfs -b 8192 -m romfs_meta.txt root cramfs.img

	cat vmlinux.bin cramfs.img >timage



clinux: vmlinux.bin decompress.bin rescue.bin

boot := arch/$(ARCH)/boot

MACHINE := arch/$(ARCH)/$(SARCH)



decompress.bin: $(target_boot_dir)

	@$(MAKE) -f $(src_compressed_dir)/Makefile $(target_compressed_dir)/decompress.bin

all: zImage



$(target_rescue_dir)/rescue.bin: $(target_boot_dir)

	@$(MAKE) -f $(src_rescue_dir)/Makefile $(target_rescue_dir)/rescue.bin

zImage Image: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@



zImage: $(target_boot_dir) vmlinux.bin $(target_rescue_dir)/rescue.bin

## zImage     - Compressed kernel (gzip)

	@$(MAKE) -f $(src_boot_dir)/Makefile zImage



$(target_boot_dir): $(target_boot_arch_dir)

	ln -sfn $< $@



$(target_boot_arch_dir):

	mkdir -p $@



compressed: zImage



archmrproper:

archclean:

	@if [ -d arch/$(ARCH)/boot ]; then \

		$(MAKE) $(clean)=arch/$(ARCH)/boot ; \

	fi

	rm -f timage vmlinux.bin decompress.bin rescue.bin cramfs.img

	rm -rf $(LD_SCRIPT).tmp



archprepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch

archprepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch FORCE



# Create some links to make all tools happy

$(SRC_ARCH)/.links:

	@rm -rf $(SRC_ARCH)/drivers

	@ln -sfn $(SRC_ARCH)/$(SARCH)/drivers $(SRC_ARCH)/drivers

	@ln -sfn $(SARCH)/drivers $(SRC_ARCH)/drivers

	@rm -rf $(SRC_ARCH)/boot

	@ln -sfn $(SRC_ARCH)/$(SARCH)/boot $(SRC_ARCH)/boot

	@ln -sfn $(SARCH)/boot $(SRC_ARCH)/boot

	@rm -rf $(SRC_ARCH)/lib

	@ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib

	@ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch

	@ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S

	@ln -sfn $(SRC_ARCH)/$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c

	@ln -sfn $(SARCH)/lib $(SRC_ARCH)/lib

	@rm -f $(SRC_ARCH)/arch/mach

	@rm -rf $(SRC_ARCH)/arch

	@ln -sfn $(SARCH) $(SRC_ARCH)/arch

ifdef CONFIG_ETRAX_ARCH_V32

	@ln -sfn ../$(SARCH)/$(MACH) $(SRC_ARCH)/arch/mach

endif

	@rm -rf $(SRC_ARCH)/kernel/vmlinux.lds.S

	@ln -sfn ../$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S

	@rm -rf $(SRC_ARCH)/kernel/asm-offsets.c

	@ln -sfn ../$(SARCH)/kernel/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c

	@touch $@



# Create link to sub arch includes

$(srctree)/include/asm-$(ARCH)/.arch: $(wildcard include/config/arch/*.h)

	@echo '  Making $(srctree)/include/asm-$(ARCH)/arch -> $(srctree)/include/asm-$(ARCH)/$(SARCH) symlink'

	@rm -f include/asm-$(ARCH)/arch

	@ln -sf $(srctree)/include/asm-$(ARCH)/$(SARCH) $(srctree)/include/asm-$(ARCH)/arch

	@echo '  SYMLINK include/asm-$(ARCH)/arch -> include/asm-$(ARCH)/$(SARCH)'

	@rm -f $(srctree)/include/asm-$(ARCH)/arch/mach

	@rm -f $(srctree)/include/asm-$(ARCH)/arch

	@ln -sf $(SARCH) $(srctree)/include/asm-$(ARCH)/arch

ifdef CONFIG_ETRAX_ARCH_V32

	@ln -sf $(MACH) $(srctree)/include/asm-$(ARCH)/arch/mach

endif

	@touch $@



archclean:

	$(Q)if [ -e arch/$(ARCH)/boot ]; then \

		$(MAKE) $(clean)=arch/$(ARCH)/boot; \

	fi



CLEAN_FILES += \

	$(MACHINE)/boot/zImage \

	$(MACHINE)/boot/compressed/decompress.bin \

	$(MACHINE)/boot/compressed/piggy.gz \

	$(MACHINE)/boot/rescue/rescue.bin \

	$(SRC_ARCH)/.links \

	$(srctree)/include/asm-$(ARCH)/.arch



MRPROPER_FILES += \

	$(SRC_ARCH)/drivers \

	$(SRC_ARCH)/boot \

	$(SRC_ARCH)/lib \

	$(SRC_ARCH)/arch \

	$(SRC_ARCH)/kernel/vmlinux.lds.S \

	$(SRC_ARCH)/kernel/asm-offsets.c



define archhelp

  echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'

  echo  '* Image         - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'

endef

arch/cris/arch-v10/Kconfig

+4 −63
Original line number Diff line number Diff line 
if ETRAX_ARCH_V10



menu "CRIS v10 options"



# ETRAX 100LX v1 has a MMU "feature" requiring a low mapping

config CRIS_LOW_MAP

	bool
@@ -228,69 +230,6 @@ config ETRAX_LED12R 
	  For products with only one or two controllable LEDs,

	  set this to same as CONFIG_ETRAX_LED1G (normally 2).



choice

	prompt "Product debug-port"

	depends on ETRAX_ARCH_V10

	default ETRAX_DEBUG_PORT0



config ETRAX_DEBUG_PORT0

	bool "Serial-0"

	help

	  Choose a serial port for the ETRAX debug console.  Default to

	  port 0.



config ETRAX_DEBUG_PORT1

	bool "Serial-1"

	help

	  Use serial port 1 for the console.



config ETRAX_DEBUG_PORT2

	bool "Serial-2"

	help

	  Use serial port 2 for the console.



config ETRAX_DEBUG_PORT3

	bool "Serial-3"

	help

	  Use serial port 3 for the console.



config ETRAX_DEBUG_PORT_NULL

	bool "disabled"

	help

	  Disable serial-port debugging.



endchoice



choice

	prompt "Kernel GDB port"

	depends on ETRAX_KGDB

	default ETRAX_KGDB_PORT0

	help

	  Choose a serial port for kernel debugging.  NOTE: This port should

	  not be enabled under Drivers for built-in interfaces (as it has its

	  own initialization code) and should not be the same as the debug port.



config ETRAX_KGDB_PORT0

	bool "Serial-0"

	help

	  Use serial port 0 for kernel debugging.



config ETRAX_KGDB_PORT1

	bool "Serial-1"

	help

	  Use serial port 1 for kernel debugging.



config ETRAX_KGDB_PORT2

	bool "Serial-2"

	help

	  Use serial port 2 for kernel debugging.



config ETRAX_KGDB_PORT3

	bool "Serial-3"

	help

	  Use serial port 3 for kernel debugging.



endchoice



choice

	prompt "Product rescue-port"
@@ -454,4 +393,6 @@ config ETRAX_POWERBUTTON_BIT 
	help

	  Configure where power button is connected.



endmenu



endif

arch/cris/arch-v10/boot/Makefile

+16 −8
Original line number Diff line number Diff line 
#

# arch/cris/boot/Makefile

# arch/cris/arch-v10/boot/Makefile

#

target = $(target_boot_dir)

src    = $(src_boot_dir)



zImage: compressed/vmlinuz

OBJCOPY = objcopy-cris

OBJCOPYFLAGS = -O binary --remove-section=.bss



compressed/vmlinuz:

	@$(MAKE) -f $(src)/compressed/Makefile $(target_compressed_dir)/vmlinuz

subdir- := compressed rescue

targets := Image



clean:

	@$(MAKE) -f $(src)/compressed/Makefile clean
 
$(obj)/Image: vmlinux FORCE

	$(call if_changed,objcopy)

	@echo '  Kernel: $@ is ready'



$(obj)/compressed/vmlinux: $(obj)/Image FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@

	$(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin



$(obj)/zImage:  $(obj)/compressed/vmlinux

	@cp $< $@

	@echo '  Kernel: $@ is ready'