config script fix
defconfig update
Makefile update
add H8S archtecture support
-- Yoshinori Sato <ysato@users.sourceforge.jp>diff -Nru linux-2.6.0-test2/arch/h8300/Kconfig linux-2.6.0-test2-h8300/arch/h8300/Kconfig --- linux-2.6.0-test2/arch/h8300/Kconfig 2003-07-14 15:00:22.000000000 +0900 +++ linux-2.6.0-test2-h8300/arch/h8300/Kconfig 2003-07-28 12:40:08.000000000 +0900 @@ -29,6 +29,9 @@ bool default n +config ISA + bool + default y source "init/Kconfig" @@ -67,6 +70,21 @@ More Information. 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 choice @@ -88,6 +106,10 @@ bool "H8/3065,3066,3067,3068,3069" 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 config CPU_H8300H @@ -95,12 +117,20 @@ depends on (H8300H_GENERIC || H8300H_AKI3068NET || H8300H_H8MAX || H8300H_SIM) default y +config CPU_H8S + bool + depends on (H8S_GENERIC || H8S_EDOSK2674 || H8S_SIM) + default y + config CPU_CLOCK int "CPU Clock Frequency (/1KHz)" default "20000" if H8300H_AKI3068NET default "25000" if H8300H_H8MAX default "16000" if H8300H_SIM default "16000" if H8300H_GENERIC + default "33000" if H8S_GENERIC + default "33000" if H8S_SIM + default "33000" if H8S_EDOSK2674 help CPU Clock Frequency divide to 1000 choice @@ -121,15 +151,28 @@ endchoice config DEFAULT_CMDLINE - bool + bool "Use buildin commandline" + default n help buildin kernel commandline enabled. config KERNEL_COMMAND - string + string "Buildin commmand string" + depends on DEFAULT_CMDLINE help 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 menu "Executable file formats" @@ -153,43 +196,6 @@ 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/irda/Kconfig" @@ -379,7 +385,7 @@ config GDB_MAGICPRINT bool "Message Output for GDB MagicPrint service" - depends on H8300H_SIM + depends on (H8300H_SIM || H8S_SIM) help kernel messages output useing MagicPrint service from GDB @@ -390,13 +396,13 @@ config GDB_DEBUG bool "Use gdb stub" - depends on !H8300H_SIM + depends on (!H8300H_SIM && H8S_SIM) help gdb stub exception support config CONFIG_SH_STANDARD_BIOS bool "Use gdb protocol serial console" - depends on !H8300H_SIM + depends on (!H8300H_SIM && H8S_SIM) help serial console output using GDB protocol. Require eCos/RedBoot diff -Nru linux-2.6.0-test2/arch/h8300/defconfig linux-2.6.0-test2-h8300/arch/h8300/defconfig --- linux-2.6.0-test2/arch/h8300/defconfig 2003-07-14 15:00:22.000000000 +0900 +++ linux-2.6.0-test2-h8300/arch/h8300/defconfig 2003-07-14 15:17:52.000000000 +0900 @@ -7,6 +7,7 @@ CONFIG_UID16=y CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set +CONFIG_ISA=y # # Code maturity level options @@ -20,7 +21,9 @@ # CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_SYSCTL is not set CONFIG_LOG_BUF_SHIFT=14 -# CONFIG_IKCONFIG is not set +CONFIG_EMBEDDED=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y # # Loadable module support @@ -42,19 +45,76 @@ CONFIG_CPU_CLOCK=16000 # CONFIG_RAMKERNEL is not set CONFIG_ROMKERNEL=y +# CONFIG_DEFAULT_CMDLINE is not set # # Executable file formats # CONFIG_KCORE_AOUT=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 # # CONFIG_BLK_DEV_FD is not set +# CONFIG_BLK_DEV_XD is not set # CONFIG_BLK_DEV_LOOP is not set # CONFIG_BLK_DEV_RAM is not set +# CONFIG_BLK_DEV_INITRD is not set # # ATA/IDE/MFM/RLL support @@ -156,6 +216,8 @@ # CONFIG_BEFS_FS is not set # CONFIG_BFS_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_VXFS_FS is not set # CONFIG_HPFS_FS is not set @@ -180,8 +242,8 @@ # CONFIG_MAGIC_SYSRQ is not set # CONFIG_HIGHPROFILE is not set CONFIG_NO_KERNEL_MSG=y -# CONFIG_GDB_MAGICPRINT is not set -# CONFIG_SYSCALL_PRINT is not set +CONFIG_GDB_MAGICPRINT=y +CONFIG_SYSCALL_PRINT=y # # Security options diff -Nru linux-2.6.0-test2/arch/h8300/vmlinux.lds.S linux-2.6.0-test2-h8300/arch/h8300/vmlinux.lds.S --- linux-2.6.0-test2/arch/h8300/vmlinux.lds.S 2003-07-14 15:00:22.000000000 +0900 +++ linux-2.6.0-test2-h8300/arch/h8300/vmlinux.lds.S 2003-07-28 12:40:08.000000000 +0900 @@ -36,3 +36,143 @@ #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 +} + diff -Nru linux-2.6.0-test2/arch/h8300/Makefile linux-2.6.0-test2-h8300/arch/h8300/Makefile --- linux-2.6.0-test2/arch/h8300/Makefile 2003-07-28 10:31:02.000000000 +0900 +++ linux-2.6.0-test2-h8300/arch/h8300/Makefile 2003-07-28 12:40:08.000000000 +0900 @@ -12,33 +12,40 @@ endif platform-$(CONFIG_CPU_H8300H) := h8300h +platform-$(CONFIG_CPU_H8S) := h8s PLATFORM := $(platform-y) board-$(CONFIG_H8300H_GENERIC) := generic -board-$(CONFIG_H8300H_AKI3068NET) := ucsimm -board-$(CONFIG_H8300H_H8MAX) := ucdimm +board-$(CONFIG_H8300H_AKI3068NET) := aki3068net +board-$(CONFIG_H8300H_H8MAX) := h8max board-$(CONFIG_H8300H_SIM) := generic +board-$(CONFIG_H8S_GENERIC) := generic +board-$(CONFIG_H8S_EDOSK2674) := edosk2674 +board-$(CONFIG_H8S_SIM) := generic BOARD := $(board-y) model-$(CONFIG_RAMKERNEL) := ram model-$(CONFIG_ROMKERNEL) := rom MODEL := $(model-y) -cflags-$(CONFIG_CPU_H8300H) := -mh +cflags-$(CONFIG_CPU_H8300H) := -mh ldflags-$(CONFIG_CPU_H8300H) := -mh8300helf +cflags-$(CONFIG_CPU_H8S) := -ms +ldflags-$(CONFIG_CPU_H8S) := -mh8300self CFLAGS += $(cflags-y) -CFLAGS += -mint32 -fno-builtin -CFLAGS += -O2 -g +CFLAGS += -mint32 -fno-builtin -Os +CFLAGS += -g CFLAGS += -D__linux__ CFLAGS += -DUTS_SYSNAME=\"uClinux\" -DTARGET=$(BOARD) AFLAGS += -DPLATFORM=$(PLATFORM) -DTARGET=$(BOARD) -DMODEL=$(MODEL) $(cflags-y) LDFLAGS += $(ldflags-y) 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) +head-y := arch/$(ARCH)/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o + core-y += arch/$(ARCH)/kernel/ \ arch/$(ARCH)/mm/ \ arch/$(ARCH)/platform/$(PLATFORM)/ \ @@ -58,3 +65,16 @@ include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \ include/asm include/linux/version.h $(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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Jul 31 2003 - 22:00:36 EST