From 33fbb515287d32978a44ec9ce26b7efb9f840fcf Mon Sep 17 00:00:00 2001 From: Serge Vakulenko Date: Fri, 29 May 2015 20:14:17 -0700 Subject: [PATCH] Fubarino and Picadillo boards: spi and oc drivers enabled. --- sys/pic32/fubarino/FUBARINO | 15 ++++++++++++--- sys/pic32/fubarino/Makefile | 3 ++- sys/pic32/picadillo/Makefile | 5 ++++- sys/pic32/picadillo/PICADILLO | 7 +++++++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/sys/pic32/fubarino/FUBARINO b/sys/pic32/fubarino/FUBARINO index 5335317..ede7b45 100644 --- a/sys/pic32/fubarino/FUBARINO +++ b/sys/pic32/fubarino/FUBARINO @@ -1,14 +1,23 @@ -# Fubarino configuration file +# +# Fubarino board +# ============== +# +# Console on USB +# SD/MMC card driver on SPI2 core pic32mx7 mapping fubarino linker bootloader-max32 device kernel led=21 cpu_khz=80000 bus_khz=80000 + device console device=ttyUSB0 device uartusb + device sd0 port=2 cs=SS + +device gpio +device oc +device spi device adc device glcd -device oc -device gpio diff --git a/sys/pic32/fubarino/Makefile b/sys/pic32/fubarino/Makefile index 54831df..5dbb9fb 100644 --- a/sys/pic32/fubarino/Makefile +++ b/sys/pic32/fubarino/Makefile @@ -6,7 +6,7 @@ S = ../../../tools/configsys/../../sys/kernel vpath %.c $(M):$(S) vpath %.S $(M):$(S) -KERNOBJ += adc.o clock.o cons.o devcfg.o devsw.o exception.o exec_aout.o exec_conf.o exec_elf.o exec_script.o exec_subr.o glcd.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 oc.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 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 usb_device.o usb_function_cdc.o usb_uart.o vers.o vfs_vnops.o vm_sched.o vm_swap.o vm_swp.o +KERNOBJ += adc.o clock.o cons.o devcfg.o devsw.o exception.o exec_aout.o exec_conf.o exec_elf.o exec_script.o exec_subr.o glcd.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 oc.o rd_sd.o rdisk.o signal.o spi.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 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 usb_device.o usb_function_cdc.o usb_uart.o vers.o vfs_vnops.o vm_sched.o vm_swap.o vm_swp.o EXTRA_TARGETS = DEFS += -DADC_ENABLED=YES @@ -55,6 +55,7 @@ DEFS += -DPIC32MX7 DEFS += -DSD0_CS_PIN=9 DEFS += -DSD0_CS_PORT=TRISG DEFS += -DSD0_PORT=2 +DEFS += -DSPI_ENABLED=YES DEFS += -DUARTUSB_ENABLED=YES DEFS += -DUCB_METER DEFS += -DUSB_MAX_EP_NUMBER=3 diff --git a/sys/pic32/picadillo/Makefile b/sys/pic32/picadillo/Makefile index a2e2339..7cf7cbd 100644 --- a/sys/pic32/picadillo/Makefile +++ b/sys/pic32/picadillo/Makefile @@ -6,7 +6,7 @@ S = ../../../tools/configsys/../../sys/kernel vpath %.c $(M):$(S) vpath %.S $(M):$(S) -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 +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 hx8357.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 oc.o rd_sd.o rdisk.o signal.o spi.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 = DEFS += -DADC_ENABLED=YES @@ -46,11 +46,14 @@ DEFS += -DEXEC_AOUT DEFS += -DEXEC_ELF DEFS += -DEXEC_SCRIPT DEFS += -DGPIO_ENABLED=YES +DEFS += -DHX8357_ENABLED DEFS += -DKERNEL +DEFS += -DOC_ENABLED=YES DEFS += -DPIC32MX7 DEFS += -DSD0_CS_PIN=9 DEFS += -DSD0_CS_PORT=TRISG DEFS += -DSD0_PORT=2 +DEFS += -DSPI_ENABLED=YES DEFS += -DUART1_BAUD=115200 DEFS += -DUART1_ENABLED=YES DEFS += -DUCB_METER diff --git a/sys/pic32/picadillo/PICADILLO b/sys/pic32/picadillo/PICADILLO index a23858b..2414a23 100644 --- a/sys/pic32/picadillo/PICADILLO +++ b/sys/pic32/picadillo/PICADILLO @@ -1,6 +1,9 @@ # # Picadillo 35T board # =================== +# +# Console on UART1 +# SD/MMC card driver on SPI2 core pic32mx7 mapping picadillo @@ -15,5 +18,9 @@ device rdisk device sd0 port=2 cs=48 device gpio +device oc +device spi device adc +device hxtft + device foreignbootloader