diff --git a/sys/pic32/machdep.c b/sys/pic32/machdep.c index ded621e..2d8c9da 100644 --- a/sys/pic32/machdep.c +++ b/sys/pic32/machdep.c @@ -102,7 +102,11 @@ extern void power_off(); int hz = HZ; int usechz = (1000000L + HZ - 1) / HZ; +#ifdef TIMEZONE struct timezone tz = { TIMEZONE, DST }; +#else +struct timezone tz = { 8*60, 1 }; +#endif int nproc = NPROC; struct namecache namecache [NNAMECACHE]; diff --git a/sys/pic32/max32/Config b/sys/pic32/max32/Config index ca10fdd..5e466bc 100644 --- a/sys/pic32/max32/Config +++ b/sys/pic32/max32/Config @@ -1,5 +1,6 @@ # -# chipKIT Max32 board +# chipKIT Max32 board with SD card shield +# For details, see https://github.com/RetroBSD/retrobsd/wiki/Board-chipKIT-Max32 # # To build the kernel, use: # cd sys/pic32/max32 @@ -20,7 +21,6 @@ timezone 8 dst maxusers 1 # Standard system options -#options "CONFIG=MAX32" # TODO options "CPU_KHZ=80000" # Oscillator frequency of CPU core options "BUS_KHZ=80000" # Frequency of peripheral bus options "HZ=100" # Rate of clock interrupt @@ -31,7 +31,7 @@ options "EXEC_SCRIPT" # Run shell scripts options "UCB_METER" # Collect kernel statistics # LED -options "LED_KERNEL_PORT=TRISA" # for kernel actibity LED... +options "LED_KERNEL_PORT=TRISA" # for kernel activity LED... options "LED_KERNEL_PIN=3" # ...use pin RA3 # Root filesystem at /dev/sd0a, swap at /dev/sd0b diff --git a/sys/pic32/wf32/.gitignore b/sys/pic32/wf32/.gitignore index 6a22af6..7e25ca8 100644 --- a/sys/pic32/wf32/.gitignore +++ b/sys/pic32/wf32/.gitignore @@ -7,3 +7,6 @@ unix.bin unix.map usbboot.map vers.c +*.h +ioconf.c +swapunix.c diff --git a/sys/pic32/wf32/Config b/sys/pic32/wf32/Config new file mode 100644 index 0000000..26e7a33 --- /dev/null +++ b/sys/pic32/wf32/Config @@ -0,0 +1,73 @@ +# +# chipKIT WF32 board with microSD card on 2.4" LCD TFT display shield +# +# To build the kernel, use: +# cd sys/pic32/wf32 +# kconfig Config +# make clean +# make +# +machine "pic32" + +cpu "PIC32MX7" +ident CHIPKIT_WF + +# Linker script +ldscript "cfg/bootloader-max32.ld" + +# Need to set locally +timezone 8 dst +maxusers 1 + +# Standard system options +options "CPU_KHZ=80000" # Oscillator frequency of CPU core +options "BUS_KHZ=80000" # Frequency of peripheral bus +options "HZ=100" # Rate of clock interrupt +options "BUS_DIV=1" # Bus clock divisor 1/2/4/8 +options "EXEC_AOUT" # Run a.out binaries +options "EXEC_ELF" # Run ELF binaries +options "EXEC_SCRIPT" # Run shell scripts +options "UCB_METER" # Collect kernel statistics + +# LED +options "LED_KERNEL_PORT=TRISA" # for kernel activity LED... +options "LED_KERNEL_PIN=0" # ...use pin RA3 +options "LED_DISK_PORT=TRISF" # for disk activity LED... +options "LED_DISK_PIN=0" # ...use pin RF0 +options "LED_TTY_PORT=TRISA" # for serial activity LED... +options "LED_TTY_PIN=1" # ...use pin RA1 + +# Root filesystem at /dev/sd0a, swap at /dev/sd0b +config unix root on sd0a + swap on sd0b + dumps on sd0b + +# Serial UART ports +device uart1 # Serial-to-USB converter +options "UART1_ENABLED" # TODO: delete this option + +# Console options +options "CONSOLE_DEVICE=tty0" # /dev/tty0 + +# SPI ports +controller spi2 # SD card +options "SPI_ENABLED" # TODO: delete this option + +# microSD card +disk sd0 at spi2 flags 0x44 # select pin RD4 +options "SD0_MHZ=10" # speed 10 MHz +options "SD0_PORT=2" # at spi2 TODO: delete +options "SD0_CS_PORT=TRISD" # for chip select... TODO: use flags +options "SD0_CS_PIN=4" # ...use pin RD4 TODO: use flags + +# General purpose I/O ports +device gpio0 +options "GPIO_ENABLED" # TODO: delete this option + +# ADC driver +device adc0 +options "ADC_ENABLED" # TODO: delete this option + +# PWM driver +device pwm0 +options "PWM_ENABLED" # TODO: delete this option diff --git a/sys/pic32/wf32/Makefile b/sys/pic32/wf32/Makefile index 5e4739a..ec15410 100644 --- a/sys/pic32/wf32/Makefile +++ b/sys/pic32/wf32/Makefile @@ -1,46 +1,330 @@ -BUILDPATH = ../../../tools/configsys/../../sys/pic32 -H = ../../../tools/configsys/../../sys/include -M = ../../../tools/configsys/../../sys/pic32 -S = ../../../tools/configsys/../../sys/kernel +IDENT=-DCHIPKIT_WF -DPIC32MX7 -DPWM_ENABLED -DADC_ENABLED -DGPIO_ENABLED -DSD0_CS_PIN=4 -DSD0_CS_PORT=TRISD -DSD0_PORT=2 -DSD0_MHZ=10 -DSPI_ENABLED -DCONSOLE_DEVICE=tty0 -DUART1_ENABLED -DLED_TTY_PIN=1 -DLED_TTY_PORT=TRISA -DLED_DISK_PIN=0 -DLED_DISK_PORT=TRISF -DLED_KERNEL_PIN=0 -DLED_KERNEL_PORT=TRISA -DUCB_METER -DEXEC_SCRIPT -DEXEC_ELF -DEXEC_AOUT -DBUS_DIV=1 -DHZ=100 -DBUS_KHZ=80000 -DCPU_KHZ=80000 +LDSCRIPT="cfg/bootloader-max32.ld" +PARAM=-DTIMEZONE=480 -DDST=1 -DMAXUSERS=1 +# +# Makefile for RetroBSD, pic32 target +# +# DEBUG is set to -g by kconfig if debugging is requested (kconfig -g). +# +include ../gcc-config.mk -vpath %.c $(M):$(S) -vpath %.S $(M):$(S) +AS = ${MIPS_GCC_PREFIX}as ${DEBUG} -mips32r2 -EL +CC = ${MIPS_GCC_PREFIX}gcc ${DEBUG} -mips32r2 -EL -nostdinc -fno-builtin -Werror -Wall +CPP = ${MIPS_GCC_PREFIX}cpp +LD = ${MIPS_GCC_PREFIX}gcc -mips32r2 -EL +LDFLAGS = -nostdlib -T ../${LDSCRIPT} -Wl,-Map=unix.map +SIZE = ${MIPS_GCC_PREFIX}size +OBJCOPY = ${MIPS_GCC_PREFIX}objcopy +OBJDUMP = ${MIPS_GCC_PREFIX}objdump -KERNOBJ += adc.o clock.o cons.o devsw.o exception.o exec_aout.o exec_conf.o exec_elf.o exec_script.o exec_subr.o gpio.o init_main.o init_sysent.o kern_clock.o kern_descrip.o kern_exec.o kern_exit.o kern_fork.o kern_mman.o kern_proc.o kern_prot.o kern_prot2.o kern_resource.o kern_sig.o kern_sig2.o kern_subr.o kern_synch.o kern_sysctl.o kern_time.o machdep.o mem.o rd_sd.o rdisk.o signal.o spi_bus.o startup.o subr_prf.o subr_rmap.o swap.o sys_generic.o sys_inode.o sys_pipe.o sys_process.o syscalls.o sysctl.o tty.o tty_subr.o tty_tty.o uart.o ufs_alloc.o ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o ufs_syscalls2.o vers.o vfs_vnops.o vm_sched.o vm_swap.o vm_swp.o -EXTRA_TARGETS = +ifneq (${MIPS_GCC_FORMAT},) + LDFLAGS += -Wl,--oformat=${MIPS_GCC_FORMAT} +endif -DEFS += -DADC_ENABLED=YES -DEFS += -DBUS_DIV=1 -DEFS += -DBUS_KHZ=80000 -DEFS += -DCONSOLE_DEVICE=tty0 -DEFS += -DCPU_IDIV=2 -DEFS += -DCPU_KHZ=80000 -DEFS += -DCPU_MUL=20 -DEFS += -DCPU_ODIV=1 -DEFS += -DCRYSTAL=8 -DEFS += -DEXEC_AOUT -DEFS += -DEXEC_ELF -DEFS += -DEXEC_SCRIPT -DEFS += -DGPIO_ENABLED=YES -DEFS += -DKERNEL -DEFS += -DLED_DISK_PIN=0 -DEFS += -DLED_DISK_PORT=TRISF -DEFS += -DLED_KERNEL_PIN=0 -DEFS += -DLED_KERNEL_PORT=TRISA -DEFS += -DLED_TTY_PIN=1 -DEFS += -DLED_TTY_PORT=TRISA -DEFS += -DPIC32MX7 -DEFS += -DSD0_CS_PIN=4 -DEFS += -DSD0_CS_PORT=TRISD -DEFS += -DSD0_PORT=2 -DEFS += -DUART1_BAUD=115200 -DEFS += -DUART1_ENABLED=YES -DEFS += -DUCB_METER +# sources are located via $S relative to the compilation directory +S = ../.. +COPTS = -I. ${IDENT} -DKERNEL +CFLAGS = -O ${COPTS} ${PARAM} -LDSCRIPT = ../../../tools/configsys/../../sys/pic32/cfg/bootloader-max32.ld +# compile rules: rules are named COMPILE_${SUFFIX} +# SUFFIX is the file suffix, capitalized (e.g. C for a .c file). -CONFIG = WF32 -CONFIGPATH = ../../../tools/configsys +COMPILE_C = ${CC} -c ${CFLAGS} $< +COMPILE_S = ${CC} -c ${COPTS} $< + +OBJS = exec_aout.o exec_conf.o exec_elf.o exec_script.o exec_subr.o \ + init_main.o init_sysent.o kern_clock.o kern_descrip.o \ + kern_exec.o kern_exit.o kern_fork.o kern_mman.o kern_proc.o \ + kern_prot.o kern_prot2.o kern_resource.o kern_sig.o kern_sig2.o \ + kern_subr.o kern_synch.o kern_sysctl.o kern_time.o rdisk.o \ + subr_prf.o subr_rmap.o sys_generic.o sys_inode.o sys_pipe.o \ + sys_process.o syscalls.o tty.o tty_subr.o tty_tty.o ufs_alloc.o \ + ufs_bio.o ufs_bmap.o ufs_dsort.o ufs_fio.o ufs_inode.o \ + ufs_mount.o ufs_namei.o ufs_subr.o ufs_syscalls.o \ + ufs_syscalls2.o vfs_vnops.o vm_sched.o vm_swap.o vm_swp.o adc.o \ + clock.o cons.o devsw.o exception.o gpio.o machdep.o mem.o pwm.o \ + rd_sd.o signal.o spi.o spi_bus.o swap.o sysctl.o uart.o + +CFILES = $S/kernel/exec_aout.c $S/kernel/exec_conf.c $S/kernel/exec_elf.c \ + $S/kernel/exec_script.c $S/kernel/exec_subr.c \ + $S/kernel/init_main.c $S/kernel/init_sysent.c \ + $S/kernel/kern_clock.c $S/kernel/kern_descrip.c \ + $S/kernel/kern_exec.c $S/kernel/kern_exit.c \ + $S/kernel/kern_fork.c $S/kernel/kern_mman.c \ + $S/kernel/kern_proc.c $S/kernel/kern_prot.c \ + $S/kernel/kern_prot2.c $S/kernel/kern_resource.c \ + $S/kernel/kern_sig.c $S/kernel/kern_sig2.c $S/kernel/kern_subr.c \ + $S/kernel/kern_synch.c $S/kernel/kern_sysctl.c \ + $S/kernel/kern_time.c $S/kernel/rdisk.c $S/kernel/subr_prf.c \ + $S/kernel/subr_rmap.c $S/kernel/sys_generic.c \ + $S/kernel/sys_inode.c $S/kernel/sys_pipe.c \ + $S/kernel/sys_process.c $S/kernel/syscalls.c $S/kernel/tty.c \ + $S/kernel/tty_subr.c $S/kernel/tty_tty.c $S/kernel/ufs_alloc.c \ + $S/kernel/ufs_bio.c $S/kernel/ufs_bmap.c $S/kernel/ufs_dsort.c \ + $S/kernel/ufs_fio.c $S/kernel/ufs_inode.c $S/kernel/ufs_mount.c \ + $S/kernel/ufs_namei.c $S/kernel/ufs_subr.c \ + $S/kernel/ufs_syscalls.c $S/kernel/ufs_syscalls2.c \ + $S/kernel/vfs_vnops.c $S/kernel/vm_sched.c $S/kernel/vm_swap.c \ + $S/kernel/vm_swp.c $S/pic32/adc.c $S/pic32/clock.c \ + $S/pic32/cons.c $S/pic32/devsw.c $S/pic32/exception.c \ + $S/pic32/gpio.c $S/pic32/machdep.c $S/pic32/mem.c $S/pic32/pwm.c \ + $S/pic32/rd_sd.c $S/pic32/signal.c $S/pic32/spi.c \ + $S/pic32/spi_bus.c $S/pic32/swap.c $S/pic32/sysctl.c \ + $S/pic32/uart.c swapunix.c + +# load lines for config "xxx" will be emitted as: +# xxx: ${SYSTEM_DEP} swapxxx.o +# ${SYSTEM_LD_HEAD} +# ${SYSTEM_LD} swapxxx.o +# ${SYSTEM_LD_TAIL} +SYSTEM_OBJ = startup.o ${OBJS} #ioconf.o +ifeq (devcfg.c,$(wildcard devcfg.c)) + SYSTEM_OBJ += devcfg.o +endif +SYSTEM_DEP = Makefile ioconf.c swapunix.c machine sys ${SYSTEM_OBJ} +SYSTEM_LD_HEAD = sh ../newvers.sh > vers.c; ${CC} $(CFLAGS) -c vers.c; rm -f $@ +SYSTEM_LD = -@echo ${LD} ${LDFLAGS} '$${SYSTEM_OBJ}' vers.o -o unix.elf; \ + ${LD} ${LDFLAGS} ${SYSTEM_OBJ} vers.o -o unix.elf +SYSTEM_LD_TAIL = ${SIZE} unix.elf; \ + $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex; \ + $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin; \ + $(OBJDUMP) -d -S unix.elf > unix.dis + +unix.elf: ${SYSTEM_DEP} swapunix.o + ${SYSTEM_LD_HEAD} + ${SYSTEM_LD} swapunix.o + ${SYSTEM_LD_TAIL} + +swapunix.o: swapunix.c + ${COMPILE_C} + +all: unix.elf + +clean: + rm -f *.elf *.o *.map *.dis *.bin + +clean-all: clean + rm -f *.h *.c machine sys + +reconfig ioconf.c swapunix.c: Config ../../../tools/kconfig/kconfig + ../../../tools/kconfig/kconfig Config + $(MAKE) clean + +load: unix.elf + pic32prog unix.hex + +startup.o: ../startup.S + ${COMPILE_S} + +# the following are necessary because the files depend on the types of +# cpu's included in the system configuration +clock.o machdep.o conf.o: Makefile + +machine: + ln -s .. $@ + +sys: + ln -s ../../include $@ + +depend: machine + mkdep ${COPTS} ${CFILES} ioconf.c + +ioconf.o: ioconf.c + ${CC} -c ${CFLAGS} ioconf.c + +exec_aout.o: $S/kernel/exec_aout.c + ${COMPILE_C} + +exec_conf.o: $S/kernel/exec_conf.c + ${COMPILE_C} + +exec_elf.o: $S/kernel/exec_elf.c + ${COMPILE_C} + +exec_script.o: $S/kernel/exec_script.c + ${COMPILE_C} + +exec_subr.o: $S/kernel/exec_subr.c + ${COMPILE_C} + +init_main.o: $S/kernel/init_main.c + ${COMPILE_C} + +init_sysent.o: $S/kernel/init_sysent.c + ${COMPILE_C} + +kern_clock.o: $S/kernel/kern_clock.c + ${COMPILE_C} + +kern_descrip.o: $S/kernel/kern_descrip.c + ${COMPILE_C} + +kern_exec.o: $S/kernel/kern_exec.c + ${COMPILE_C} + +kern_exit.o: $S/kernel/kern_exit.c + ${COMPILE_C} + +kern_fork.o: $S/kernel/kern_fork.c + ${COMPILE_C} + +kern_mman.o: $S/kernel/kern_mman.c + ${COMPILE_C} + +kern_proc.o: $S/kernel/kern_proc.c + ${COMPILE_C} + +kern_prot.o: $S/kernel/kern_prot.c + ${COMPILE_C} + +kern_prot2.o: $S/kernel/kern_prot2.c + ${COMPILE_C} + +kern_resource.o: $S/kernel/kern_resource.c + ${COMPILE_C} + +kern_sig.o: $S/kernel/kern_sig.c + ${COMPILE_C} + +kern_sig2.o: $S/kernel/kern_sig2.c + ${COMPILE_C} + +kern_subr.o: $S/kernel/kern_subr.c + ${COMPILE_C} + +kern_synch.o: $S/kernel/kern_synch.c + ${COMPILE_C} + +kern_sysctl.o: $S/kernel/kern_sysctl.c + ${COMPILE_C} + +kern_time.o: $S/kernel/kern_time.c + ${COMPILE_C} + +rdisk.o: $S/kernel/rdisk.c + ${COMPILE_C} + +subr_prf.o: $S/kernel/subr_prf.c + ${COMPILE_C} + +subr_rmap.o: $S/kernel/subr_rmap.c + ${COMPILE_C} + +sys_generic.o: $S/kernel/sys_generic.c + ${COMPILE_C} + +sys_inode.o: $S/kernel/sys_inode.c + ${COMPILE_C} + +sys_pipe.o: $S/kernel/sys_pipe.c + ${COMPILE_C} + +sys_process.o: $S/kernel/sys_process.c + ${COMPILE_C} + +syscalls.o: $S/kernel/syscalls.c + ${COMPILE_C} + +tty.o: $S/kernel/tty.c + ${COMPILE_C} + +tty_subr.o: $S/kernel/tty_subr.c + ${COMPILE_C} + +tty_tty.o: $S/kernel/tty_tty.c + ${COMPILE_C} + +ufs_alloc.o: $S/kernel/ufs_alloc.c + ${COMPILE_C} + +ufs_bio.o: $S/kernel/ufs_bio.c + ${COMPILE_C} + +ufs_bmap.o: $S/kernel/ufs_bmap.c + ${COMPILE_C} + +ufs_dsort.o: $S/kernel/ufs_dsort.c + ${COMPILE_C} + +ufs_fio.o: $S/kernel/ufs_fio.c + ${COMPILE_C} + +ufs_inode.o: $S/kernel/ufs_inode.c + ${COMPILE_C} + +ufs_mount.o: $S/kernel/ufs_mount.c + ${COMPILE_C} + +ufs_namei.o: $S/kernel/ufs_namei.c + ${COMPILE_C} + +ufs_subr.o: $S/kernel/ufs_subr.c + ${COMPILE_C} + +ufs_syscalls.o: $S/kernel/ufs_syscalls.c + ${COMPILE_C} + +ufs_syscalls2.o: $S/kernel/ufs_syscalls2.c + ${COMPILE_C} + +vfs_vnops.o: $S/kernel/vfs_vnops.c + ${COMPILE_C} + +vm_sched.o: $S/kernel/vm_sched.c + ${COMPILE_C} + +vm_swap.o: $S/kernel/vm_swap.c + ${COMPILE_C} + +vm_swp.o: $S/kernel/vm_swp.c + ${COMPILE_C} + +adc.o: $S/pic32/adc.c + ${COMPILE_C} + +clock.o: $S/pic32/clock.c + ${COMPILE_C} + +cons.o: $S/pic32/cons.c + ${COMPILE_C} + +devsw.o: $S/pic32/devsw.c + ${COMPILE_C} + +exception.o: $S/pic32/exception.c + ${COMPILE_C} + +gpio.o: $S/pic32/gpio.c + ${COMPILE_C} + +machdep.o: $S/pic32/machdep.c + ${COMPILE_C} + +mem.o: $S/pic32/mem.c + ${COMPILE_C} + +pwm.o: $S/pic32/pwm.c + ${COMPILE_C} + +rd_sd.o: $S/pic32/rd_sd.c + ${COMPILE_C} + +signal.o: $S/pic32/signal.c + ${COMPILE_C} + +spi.o: $S/pic32/spi.c + ${COMPILE_C} + +spi_bus.o: $S/pic32/spi_bus.c + ${COMPILE_C} + +swap.o: $S/pic32/swap.c + ${COMPILE_C} + +sysctl.o: $S/pic32/sysctl.c + ${COMPILE_C} + +uart.o: $S/pic32/uart.c + ${COMPILE_C} -include ../../../tools/configsys/../../sys/pic32/kernel-post.mk diff --git a/sys/pic32/wf32/WF32 b/sys/pic32/wf32/WF32 index 4778b41..7253c86 100644 --- a/sys/pic32/wf32/WF32 +++ b/sys/pic32/wf32/WF32 @@ -1,5 +1,6 @@ # # chipKIT WF32 board with microSD card on 2.4" LCD TFT display shield +# =================================================================== # # See http://misc.ws/2013/11/08/touch-screen-shield-for-arduino-uno/ # for shield information