Commit 4f7a28bb authored by Yoshinori Sato's avatar Yoshinori Sato Committed by Linus Torvalds

[PATCH] h8300: config updates

config script fix
defconfig update
Makefile update
add H8S archtecture support
parent 1891a54b
...@@ -29,6 +29,9 @@ config RWSEM_XCHGADD_ALGORITHM ...@@ -29,6 +29,9 @@ config RWSEM_XCHGADD_ALGORITHM
bool bool
default n default n
config ISA
bool
default y
source "init/Kconfig" source "init/Kconfig"
...@@ -67,6 +70,21 @@ config H8300H_SIM ...@@ -67,6 +70,21 @@ config H8300H_SIM
More Information. More Information.
arch/h8300/Doc/simulator.txt arch/h8300/Doc/simulator.txt
config H8S_EDOSK2674
bool "EDOSK-2674"
help
Renesas EDOSK-2674R Evalution Board Support
More Information.
<http://www.azpower.com/H8-uClinux/index.html>
<http://www.eu.renesas.com/tools/edk/support/edosk2674.html>
config H8S_SIM
bool "H8S Simulator"
help
GDB Simulator Support
More Information.
arch/h8300/Doc/simulator.txt
endchoice endchoice
choice choice
...@@ -88,6 +106,10 @@ config H83068 ...@@ -88,6 +106,10 @@ config H83068
bool "H8/3065,3066,3067,3068,3069" bool "H8/3065,3066,3067,3068,3069"
depends on (H8300H_GENERIC || H8300H_AKI3068NET || H8300H_H8MAX) depends on (H8300H_GENERIC || H8300H_AKI3068NET || H8300H_H8MAX)
config H8S2678
bool "H8S/2670,2673,2674R,2675,2676"
depends on (H8S_GENERIC || H8S_EDOSK2674 || H8S_SIM)
endchoice endchoice
config CPU_H8300H config CPU_H8300H
...@@ -95,12 +117,20 @@ config CPU_H8300H ...@@ -95,12 +117,20 @@ config CPU_H8300H
depends on (H8300H_GENERIC || H8300H_AKI3068NET || H8300H_H8MAX || H8300H_SIM) depends on (H8300H_GENERIC || H8300H_AKI3068NET || H8300H_H8MAX || H8300H_SIM)
default y default y
config CPU_H8S
bool
depends on (H8S_GENERIC || H8S_EDOSK2674 || H8S_SIM)
default y
config CPU_CLOCK config CPU_CLOCK
int "CPU Clock Frequency (/1KHz)" int "CPU Clock Frequency (/1KHz)"
default "20000" if H8300H_AKI3068NET default "20000" if H8300H_AKI3068NET
default "25000" if H8300H_H8MAX default "25000" if H8300H_H8MAX
default "16000" if H8300H_SIM default "16000" if H8300H_SIM
default "16000" if H8300H_GENERIC default "16000" if H8300H_GENERIC
default "33000" if H8S_GENERIC
default "33000" if H8S_SIM
default "33000" if H8S_EDOSK2674
help help
CPU Clock Frequency divide to 1000 CPU Clock Frequency divide to 1000
choice choice
...@@ -121,15 +151,28 @@ config ROMKERNEL ...@@ -121,15 +151,28 @@ config ROMKERNEL
endchoice endchoice
config DEFAULT_CMDLINE config DEFAULT_CMDLINE
bool bool "Use buildin commandline"
default n
help help
buildin kernel commandline enabled. buildin kernel commandline enabled.
config KERNEL_COMMAND config KERNEL_COMMAND
string string "Buildin commmand string"
depends on DEFAULT_CMDLINE
help help
buildin kernel commandline strings. buildin kernel commandline strings.
config BLKDEV_RESERVE
bool "BLKDEV Reserved Memory"
default n
help
Reserved BLKDEV area.
config CONFIG_BLKDEV_RESERVE_ADDRESS
hex 'start address'
depends on BLKDEV_RESERVE
help
BLKDEV start address.
endmenu endmenu
menu "Executable file formats" menu "Executable file formats"
...@@ -153,43 +196,6 @@ source "drivers/ide/Kconfig" ...@@ -153,43 +196,6 @@ source "drivers/ide/Kconfig"
source "net/Kconfig" source "net/Kconfig"
menu "Network device support"
depends on NET
config NETDEVICES
bool "Network device support"
---help---
You can say N here if you don't intend to connect your Linux box to
any other computer at all or if all your connections will be over a
telephone line with a modem either via UUCP (UUCP is a protocol to
forward mail and news between unix hosts over telephone lines; read
the UUCP-HOWTO, available from
<http://www.tldp.org/docs.html#howto>) or dialing up a shell
account or a BBS, even using term (term is a program which gives you
almost full Internet connectivity if you have a regular dial up
shell account on some Internet connected Unix computer. Read
<http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>).
You'll have to say Y if your computer contains a network card that
you want to use under Linux (make sure you know its name because you
will be asked for it and read the Ethernet-HOWTO (especially if you
plan to use more than one network card under Linux)) or if you want
to use SLIP (Serial Line Internet Protocol is the protocol used to
send Internet traffic over telephone lines or null modem cables) or
CSLIP (compressed SLIP) or PPP (Point to Point Protocol, a better
and newer replacement for SLIP) or PLIP (Parallel Line Internet
Protocol is mainly used to create a mini network by connecting the
parallel ports of two local machines) or AX.25/KISS (protocol for
sending Internet traffic over amateur radio links).
Make sure to read the NET-3-HOWTO. Eventually, you will have to read
Olaf Kirch's excellent and free book "Network Administrator's
Guide", to be found in <http://www.tldp.org/docs.html#guide>. If
unsure, say Y.
endmenu
source "net/ax25/Kconfig" source "net/ax25/Kconfig"
source "net/irda/Kconfig" source "net/irda/Kconfig"
...@@ -379,7 +385,7 @@ config NO_KERNEL_MSG ...@@ -379,7 +385,7 @@ config NO_KERNEL_MSG
config GDB_MAGICPRINT config GDB_MAGICPRINT
bool "Message Output for GDB MagicPrint service" bool "Message Output for GDB MagicPrint service"
depends on H8300H_SIM depends on (H8300H_SIM || H8S_SIM)
help help
kernel messages output useing MagicPrint service from GDB kernel messages output useing MagicPrint service from GDB
...@@ -390,13 +396,13 @@ config SYSCALL_PRINT ...@@ -390,13 +396,13 @@ config SYSCALL_PRINT
config GDB_DEBUG config GDB_DEBUG
bool "Use gdb stub" bool "Use gdb stub"
depends on !H8300H_SIM depends on (!H8300H_SIM && H8S_SIM)
help help
gdb stub exception support gdb stub exception support
config CONFIG_SH_STANDARD_BIOS config CONFIG_SH_STANDARD_BIOS
bool "Use gdb protocol serial console" bool "Use gdb protocol serial console"
depends on !H8300H_SIM depends on (!H8300H_SIM && H8S_SIM)
help help
serial console output using GDB protocol. serial console output using GDB protocol.
Require eCos/RedBoot Require eCos/RedBoot
......
...@@ -12,33 +12,40 @@ ifndef include-config ...@@ -12,33 +12,40 @@ ifndef include-config
endif endif
platform-$(CONFIG_CPU_H8300H) := h8300h platform-$(CONFIG_CPU_H8300H) := h8300h
platform-$(CONFIG_CPU_H8S) := h8s
PLATFORM := $(platform-y) PLATFORM := $(platform-y)
board-$(CONFIG_H8300H_GENERIC) := generic board-$(CONFIG_H8300H_GENERIC) := generic
board-$(CONFIG_H8300H_AKI3068NET) := ucsimm board-$(CONFIG_H8300H_AKI3068NET) := aki3068net
board-$(CONFIG_H8300H_H8MAX) := ucdimm board-$(CONFIG_H8300H_H8MAX) := h8max
board-$(CONFIG_H8300H_SIM) := generic board-$(CONFIG_H8300H_SIM) := generic
board-$(CONFIG_H8S_GENERIC) := generic
board-$(CONFIG_H8S_EDOSK2674) := edosk2674
board-$(CONFIG_H8S_SIM) := generic
BOARD := $(board-y) BOARD := $(board-y)
model-$(CONFIG_RAMKERNEL) := ram model-$(CONFIG_RAMKERNEL) := ram
model-$(CONFIG_ROMKERNEL) := rom model-$(CONFIG_ROMKERNEL) := rom
MODEL := $(model-y) MODEL := $(model-y)
cflags-$(CONFIG_CPU_H8300H) := -mh cflags-$(CONFIG_CPU_H8300H) := -mh
ldflags-$(CONFIG_CPU_H8300H) := -mh8300helf ldflags-$(CONFIG_CPU_H8300H) := -mh8300helf
cflags-$(CONFIG_CPU_H8S) := -ms
ldflags-$(CONFIG_CPU_H8S) := -mh8300self
CFLAGS += $(cflags-y) CFLAGS += $(cflags-y)
CFLAGS += -mint32 -fno-builtin CFLAGS += -mint32 -fno-builtin -Os
CFLAGS += -O2 -g CFLAGS += -g
CFLAGS += -D__linux__ CFLAGS += -D__linux__
CFLAGS += -DUTS_SYSNAME=\"uClinux\" -DTARGET=$(BOARD) CFLAGS += -DUTS_SYSNAME=\"uClinux\" -DTARGET=$(BOARD)
AFLAGS += -DPLATFORM=$(PLATFORM) -DTARGET=$(BOARD) -DMODEL=$(MODEL) $(cflags-y) AFLAGS += -DPLATFORM=$(PLATFORM) -DTARGET=$(BOARD) -DMODEL=$(MODEL) $(cflags-y)
LDFLAGS += $(ldflags-y) LDFLAGS += $(ldflags-y)
CROSS_COMPILE = h8300-elf- CROSS_COMPILE = h8300-elf-
#HEAD := arch/$(ARCH)/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
LIBGCC := $(shell $(CROSS-COMPILE)$(CC) $(CFLAGS) -print-libgcc-file-name) LIBGCC := $(shell $(CROSS-COMPILE)$(CC) $(CFLAGS) -print-libgcc-file-name)
head-y := arch/$(ARCH)/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
core-y += arch/$(ARCH)/kernel/ \ core-y += arch/$(ARCH)/kernel/ \
arch/$(ARCH)/mm/ \ arch/$(ARCH)/mm/ \
arch/$(ARCH)/platform/$(PLATFORM)/ \ arch/$(ARCH)/platform/$(PLATFORM)/ \
...@@ -58,3 +65,16 @@ prepare: include/asm-$(ARCH)/asm-offsets.h ...@@ -58,3 +65,16 @@ prepare: include/asm-$(ARCH)/asm-offsets.h
include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \ include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
include/asm include/linux/version.h include/asm include/linux/version.h
$(call filechk,gen-asm-offsets) $(call filechk,gen-asm-offsets)
vmlinux.bin: vmlinux
$(OBJCOPY) -Obinary $< $@
vmlinux.srec: vmlinux
$(OBJCOPY) -Osrec $< $@
define archhelp
echo 'vmlinux.bin - Create raw binary'
echo 'vmlinux.srec - Create srec binary'
endef
CLEAN_FILES += arch/$(ARCH)/vmlinux.bin arch/$(ARCH)/vmlinux.srec
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
CONFIG_UID16=y CONFIG_UID16=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y CONFIG_RWSEM_GENERIC_SPINLOCK=y
# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
CONFIG_ISA=y
# #
# Code maturity level options # Code maturity level options
...@@ -20,7 +21,9 @@ CONFIG_EXPERIMENTAL=y ...@@ -20,7 +21,9 @@ CONFIG_EXPERIMENTAL=y
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_SYSCTL is not set # CONFIG_SYSCTL is not set
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
# CONFIG_IKCONFIG is not set CONFIG_EMBEDDED=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
# #
# Loadable module support # Loadable module support
...@@ -42,19 +45,76 @@ CONFIG_CPU_H8300H=y ...@@ -42,19 +45,76 @@ CONFIG_CPU_H8300H=y
CONFIG_CPU_CLOCK=16000 CONFIG_CPU_CLOCK=16000
# CONFIG_RAMKERNEL is not set # CONFIG_RAMKERNEL is not set
CONFIG_ROMKERNEL=y CONFIG_ROMKERNEL=y
# CONFIG_DEFAULT_CMDLINE is not set
# #
# Executable file formats # Executable file formats
# #
CONFIG_KCORE_AOUT=y CONFIG_KCORE_AOUT=y
CONFIG_BINFMT_FLAT=y CONFIG_BINFMT_FLAT=y
# CONFIG_BINFMT_ZFLAT is not set
# CONFIG_BINFMT_MISC is not set
#
# Memory Technology Devices (MTD)
#
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_CONCAT is not set
# CONFIG_MTD_REDBOOT_PARTS is not set
# CONFIG_MTD_CMDLINE_PARTS is not set
#
# User Modules And Translation Layers
#
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
# CONFIG_FTL is not set
# CONFIG_NFTL is not set
#
# RAM/ROM/Flash chip drivers
#
# CONFIG_MTD_CFI is not set
# CONFIG_MTD_JEDECPROBE is not set
CONFIG_MTD_RAM=y
# CONFIG_MTD_ROM is not set
# CONFIG_MTD_ABSENT is not set
# CONFIG_MTD_OBSOLETE_CHIPS is not set
#
# Mapping drivers for chip access
#
CONFIG_MTD_UCLINUX=y
#
# Self-contained MTD device drivers
#
# CONFIG_MTD_SLRAM is not set
# CONFIG_MTD_MTDRAM is not set
# CONFIG_MTD_BLKMTD is not set
#
# Disk-On-Chip Device Drivers
#
# CONFIG_MTD_DOC1000 is not set
# CONFIG_MTD_DOC2000 is not set
# CONFIG_MTD_DOC2001 is not set
#
# NAND Flash Device Drivers
#
# CONFIG_MTD_NAND is not set
# #
# Block devices # Block devices
# #
# CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_XD is not set
# CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_LOOP is not set
# CONFIG_BLK_DEV_RAM is not set # CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_INITRD is not set
# #
# ATA/IDE/MFM/RLL support # ATA/IDE/MFM/RLL support
...@@ -156,6 +216,8 @@ CONFIG_RAMFS=y ...@@ -156,6 +216,8 @@ CONFIG_RAMFS=y
# CONFIG_BEFS_FS is not set # CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set # CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set # CONFIG_EFS_FS is not set
# CONFIG_JFFS_FS is not set
# CONFIG_JFFS2_FS is not set
# CONFIG_CRAMFS is not set # CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set # CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set # CONFIG_HPFS_FS is not set
...@@ -180,8 +242,8 @@ CONFIG_FULLDEBUG=y ...@@ -180,8 +242,8 @@ CONFIG_FULLDEBUG=y
# CONFIG_MAGIC_SYSRQ is not set # CONFIG_MAGIC_SYSRQ is not set
# CONFIG_HIGHPROFILE is not set # CONFIG_HIGHPROFILE is not set
CONFIG_NO_KERNEL_MSG=y CONFIG_NO_KERNEL_MSG=y
# CONFIG_GDB_MAGICPRINT is not set CONFIG_GDB_MAGICPRINT=y
# CONFIG_SYSCALL_PRINT is not set CONFIG_SYSCALL_PRINT=y
# #
# Security options # Security options
......
...@@ -36,3 +36,143 @@ ...@@ -36,3 +36,143 @@
#endif #endif
#endif #endif
#ifdef CONFIG_H8S_SIM
#ifdef CONFIG_ROMKERNEL
#include "platform/h8s/generic/rom.ld"
#endif
#ifdef CONFIG_RAMKERNEL
#include "platform/h8s/generic/ram.ld"
#endif
#endif
#ifdef CONFIG_H8S_EDOSK2674
#ifdef CONFIG_ROMKERNEL
#include "platform/h8s/edosk2674/rom.ld"
#endif
#ifdef CONFIG_RAMKERNEL
#include "platform/h8s/edosk2674/ram.ld"
#endif
#endif
_jiffies = _jiffies_64 + 4;
SECTIONS
{
#if defined(CONFIG_ROMKERNEL)
.vectors :
{
__vector = . ;
*(.vectors*)
} > vector
#endif
#if defined(CONFIG_RAMKERNEL)
.bootvec :
{
*(.bootvec)
} > ram
#endif
.text :
{
#if defined(CONFIG_ROMKERNEL)
*(.int_redirect)
#endif
__stext = . ;
*(.text)
. = ALIGN(0x4) ;
*(.exit.text)
*(.text.*)
. = ALIGN(0x4) ;
*(.exitcall.exit)
. = ALIGN(0x4) ;
*(.kstrtab)
. = ALIGN(0x4) ;
*(.rodata*)
. = ALIGN(16); /* Exception table */
___start___ex_table = .;
*(__ex_table)
___stop___ex_table = .;
___start___ksymtab = .; /* Kernel symbol table */
*(__ksymtab)
___stop___ksymtab = .;
. = ALIGN(0x4) ;
__etext = . ;
#if defined(CONFIG_ROMKERNEL)
} > rom
#endif
#if defined(CONFIG_RAMKERNEL)
} > ram
#endif
.data : AT( ADDR(.text)+SIZEOF(.text))
{
__sdata = . ;
___data_start = . ;
. = ALIGN(0x2000) ;
*(.data.init_task)
. = ALIGN(0x4) ;
*(.data)
. = ALIGN(0x4) ;
*(.data.*)
. = ALIGN(0x4) ;
___init_begin = .;
__sinittext = .;
*(.init.text)
__einittext = .;
*(.init.data)
. = ALIGN(0x4) ;
___setup_start = .;
*(.init.setup)
. = ALIGN(0x4) ;
___setup_end = .;
___start___param = .;
*(__param)
___stop___param = .;
___initcall_start = .;
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
___initcall_end = .;
___con_initcall_start = .;
*(.con_initcall.init)
___con_initcall_end = .;
. = ALIGN(4);
___initramfs_start = .;
*(.init.ramfs)
___initramfs_end = .;
. = ALIGN(0x4) ;
___init_end = .;
__edata = . ;
} > ram
__begin_data = LOADADDR(.data) ;
#if defined(CONFIG_ROMKERNEL)
.erom :
{
__erom = . ;
} > erom
#endif
.bss :
{
. = ALIGN(0x4) ;
__sbss = . ;
*(.bss*)
. = ALIGN(0x4) ;
*(COMMON)
. = ALIGN(0x4) ;
__ebss = . ;
__end = . ;
__ramstart = .;
} > ram
.dummy :
{
COMMAND_START = . - 0x200 ;
__ramend = . ;
} > eram
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment