From 7aa774702b5a9fe1e0633b568a2a7eb5610cca51 Mon Sep 17 00:00:00 2001 From: Sergey Date: Sat, 4 Oct 2014 14:30:21 -0700 Subject: [PATCH] Fubarino configuration modified to use Arduino-compatible bootloader. --- sys/pic32/fubarino/FUBARINO | 4 +--- sys/pic32/fubarino/Makefile | 19 +++---------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/sys/pic32/fubarino/FUBARINO b/sys/pic32/fubarino/FUBARINO index bb6bb88..5335317 100644 --- a/sys/pic32/fubarino/FUBARINO +++ b/sys/pic32/fubarino/FUBARINO @@ -2,7 +2,7 @@ core pic32mx7 mapping fubarino -linker bootloader +linker bootloader-max32 device kernel led=21 cpu_khz=80000 bus_khz=80000 device console device=ttyUSB0 @@ -12,5 +12,3 @@ device adc device glcd device oc device gpio - -device bootloader led=21 button=23 crystal=8 jump=0x9d000000 diff --git a/sys/pic32/fubarino/Makefile b/sys/pic32/fubarino/Makefile index f9ace21..54831df 100644 --- a/sys/pic32/fubarino/Makefile +++ b/sys/pic32/fubarino/Makefile @@ -6,15 +6,10 @@ 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 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 -EXTRA_TARGETS = bootloader +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 +EXTRA_TARGETS = DEFS += -DADC_ENABLED=YES -DEFS += -DBL_BUTTON_PIN=7 -DEFS += -DBL_BUTTON_PORT=TRISE -DEFS += -DBL_CRYSTAL=8 -DEFS += -DBL_LED_PIN=5 -DEFS += -DBL_LED_PORT=TRISE DEFS += -DBUS_DIV=1 DEFS += -DBUS_KHZ=80000 DEFS += -DCONSOLE_DEVICE=ttyUSB0 @@ -50,15 +45,8 @@ DEFS += -DDC3_VBUSON=DEVCFG3_FVBUSONIO DEFS += -DEXEC_AOUT DEFS += -DEXEC_ELF DEFS += -DEXEC_SCRIPT -DEFS += -DFLASH_JUMP=0x9d000000 DEFS += -DGLCD_ENABLED=YES DEFS += -DGPIO_ENABLED=YES -DEFS += -DHID_FEATURE_REPORT_BYTES=2 -DEFS += -DHID_INPUT_REPORT_BYTES=2 -DEFS += -DHID_INT_IN_EP_SIZE=64 -DEFS += -DHID_INT_OUT_EP_SIZE=64 -DEFS += -DHID_OUTPUT_REPORT_BYTES=2 -DEFS += -DHID_RPT01_SIZE=29 DEFS += -DKERNEL DEFS += -DLED_KERNEL_PIN=5 DEFS += -DLED_KERNEL_PORT=TRISE @@ -69,12 +57,11 @@ DEFS += -DSD0_CS_PORT=TRISG DEFS += -DSD0_PORT=2 DEFS += -DUARTUSB_ENABLED=YES DEFS += -DUCB_METER -DEFS += -DUSB_EP0_BUFF_SIZE=8 DEFS += -DUSB_MAX_EP_NUMBER=3 DEFS += -DUSB_NUM_STRING_DESCRIPTORS=3 -LDSCRIPT = ../../../tools/configsys/../../sys/pic32/cfg/bootloader.ld +LDSCRIPT = ../../../tools/configsys/../../sys/pic32/cfg/bootloader-max32.ld CONFIG = FUBARINO CONFIGPATH = ../../../tools/configsys