diff --git a/sys/pic32/32mxsdram/Config b/sys/pic32/32mxsdram/Config index 2a14747..6cd67c5 100644 --- a/sys/pic32/32mxsdram/Config +++ b/sys/pic32/32mxsdram/Config @@ -15,7 +15,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "CUSTOM_32MXSDRAM" # Board type -ldscript "cfg/bootloader-sdram.ld" # Linker script +ldscript "32mxsdram/bootloader.ld" # Linker script # Standard system options options "HZ=1000" # Rate of timer interrupt diff --git a/sys/pic32/32mxsdram/Makefile b/sys/pic32/32mxsdram/Makefile index 9f5ba99..a591bdb 100644 --- a/sys/pic32/32mxsdram/Makefile +++ b/sys/pic32/32mxsdram/Makefile @@ -29,7 +29,7 @@ PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 PARAM += -DHZ=1000 -LDSCRIPT = "cfg/bootloader-sdram.ld" +LDSCRIPT = "32mxsdram/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/cfg/bootloader-sdram.ld b/sys/pic32/32mxsdram/bootloader.ld similarity index 100% rename from sys/pic32/cfg/bootloader-sdram.ld rename to sys/pic32/32mxsdram/bootloader.ld diff --git a/sys/pic32/Config.generic b/sys/pic32/Config.generic index 9c0bc58..d20d782 100644 --- a/sys/pic32/Config.generic +++ b/sys/pic32/Config.generic @@ -14,7 +14,7 @@ cpu "PIC32MX7" # Processor variant board "CHIPKIT_MAX32" # Board type # Linker script -ldscript "cfg/bootloader-max32.ld" +ldscript "max32/bootloader.ld" # Need to set locally timezone 8 dst diff --git a/sys/pic32/baremetal/Config b/sys/pic32/baremetal/Config index 1b0b05d..149e516 100644 --- a/sys/pic32/baremetal/Config +++ b/sys/pic32/baremetal/Config @@ -15,7 +15,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "BAREMETAL" # Board type -ldscript "cfg/bare.ld" # Linker script +ldscript "baremetal/script.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/baremetal/Makefile b/sys/pic32/baremetal/Makefile index 3839e7b..4e7a101 100644 --- a/sys/pic32/baremetal/Makefile +++ b/sys/pic32/baremetal/Makefile @@ -19,7 +19,7 @@ PARAM += -DLED_KERNEL_PORT=TRISD PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bare.ld" +LDSCRIPT = "baremetal/script.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/cfg/bare.ld b/sys/pic32/baremetal/script.ld similarity index 100% rename from sys/pic32/cfg/bare.ld rename to sys/pic32/baremetal/script.ld diff --git a/sys/pic32/duinomite-emega/Config b/sys/pic32/duinomite-emega/Config index 94512b3..9a05422 100644 --- a/sys/pic32/duinomite-emega/Config +++ b/sys/pic32/duinomite-emega/Config @@ -17,7 +17,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "DUINOMITE" # Board type -ldscript "cfg/bootloader-maximite.ld" # Linker script +ldscript "maximite/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/duinomite-emega/Config-uart b/sys/pic32/duinomite-emega/Config-uart index 7edff88..ffba897 100644 --- a/sys/pic32/duinomite-emega/Config-uart +++ b/sys/pic32/duinomite-emega/Config-uart @@ -17,7 +17,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "DUINOMITE" # Board type -ldscript "cfg/bootloader-maximite.ld" # Linker script +ldscript "maximite/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/duinomite-emega/Makefile b/sys/pic32/duinomite-emega/Makefile index 42bab90..d2acab7 100644 --- a/sys/pic32/duinomite-emega/Makefile +++ b/sys/pic32/duinomite-emega/Makefile @@ -20,7 +20,7 @@ PARAM += -DLED_KERNEL_PORT=TRISB PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=40000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-maximite.ld" +LDSCRIPT = "maximite/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/duinomite/Config b/sys/pic32/duinomite/Config index 4af704a..2d2dc3b 100644 --- a/sys/pic32/duinomite/Config +++ b/sys/pic32/duinomite/Config @@ -16,7 +16,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "DUINOMITE" # Board type -ldscript "cfg/bootloader-maximite.ld" # Linker script +ldscript "maximite/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/duinomite/Config-uart b/sys/pic32/duinomite/Config-uart index 5e26c54..57d5ee3 100644 --- a/sys/pic32/duinomite/Config-uart +++ b/sys/pic32/duinomite/Config-uart @@ -16,7 +16,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "DUINOMITE" # Board type -ldscript "cfg/bootloader-maximite.ld" # Linker script +ldscript "maximite/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/duinomite/Makefile b/sys/pic32/duinomite/Makefile index 2bf244b..12ae392 100644 --- a/sys/pic32/duinomite/Makefile +++ b/sys/pic32/duinomite/Makefile @@ -20,7 +20,7 @@ PARAM += -DLED_KERNEL_PORT=TRISB PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-maximite.ld" +LDSCRIPT = "maximite/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/explorer16/Config b/sys/pic32/explorer16/Config index 6885508..a3290ef 100644 --- a/sys/pic32/explorer16/Config +++ b/sys/pic32/explorer16/Config @@ -15,7 +15,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "EXPLORER16" # Board type -ldscript "cfg/bare.ld" # Linker script +ldscript "baremetal/script.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/explorer16/Makefile b/sys/pic32/explorer16/Makefile index fc9516d..532a5cc 100644 --- a/sys/pic32/explorer16/Makefile +++ b/sys/pic32/explorer16/Makefile @@ -21,7 +21,7 @@ PARAM += -DLED_DISK_PORT=TRISA PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bare.ld" +LDSCRIPT = "baremetal/script.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/fubarino/Config b/sys/pic32/fubarino/Config index 5bb1c8a..37b8e05 100644 --- a/sys/pic32/fubarino/Config +++ b/sys/pic32/fubarino/Config @@ -16,7 +16,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "FUBARINO" # Board type -ldscript "cfg/bootloader-max32.ld" # Linker script +ldscript "max32/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/fubarino/Config-uart-sramc b/sys/pic32/fubarino/Config-uart-sramc index 976e2c6..95319d8 100644 --- a/sys/pic32/fubarino/Config-uart-sramc +++ b/sys/pic32/fubarino/Config-uart-sramc @@ -17,7 +17,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "FUBARINO" # Board type -ldscript "cfg/bootloader-max32.ld" # Linker script +ldscript "max32/bootloader.ld" # Linker script # Standard system options options "HZ=1000" # Rate of clock interrupt diff --git a/sys/pic32/fubarino/Makefile b/sys/pic32/fubarino/Makefile index d6d4f22..11a354e 100644 --- a/sys/pic32/fubarino/Makefile +++ b/sys/pic32/fubarino/Makefile @@ -17,7 +17,7 @@ PARAM += -DLED_KERNEL_PORT=TRISE PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-max32.ld" +LDSCRIPT = "max32/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/kbd.c b/sys/pic32/kbd.c index 2d57e3c..13bdf19 100644 --- a/sys/pic32/kbd.c +++ b/sys/pic32/kbd.c @@ -85,9 +85,87 @@ int key_state, key_count, key_parity, key_timer; #define SCRL 0x7e #ifdef USASCII -#include "usascii.inc" +// +// Map of standard keyboard, US ASCII layout +// +const char lowerKey[128]={ + 0, F9, 0, F5, F3, F1, F2, F12, //00 + 0, F10, F8, F6, F4, TAB, '`', 0, //08 + 0, 0, L_SHF, 0, L_CTL, 'q', '1', 0, //10 + 0, 0, 'z', 's', 'a', 'w', '2', 0, //18 + 0, 'c', 'x', 'd', 'e', '4', '3', 0, //20 + 0, ' ', 'v', 'f', 't', 'r', '5', 0, //28 + 0, 'n', 'b', 'h', 'g', 'y', '6', 0, //30 + 0, 0, 'm', 'j', 'u', '7', '8', 0, //38 + 0, ',', 'k', 'i', 'o', '0', '9', 0, //40 + 0, '.', '/', 'l', ';', 'p', '-', 0, //48 + 0, 0, '\'', 0, '[', '=', 0, 0, //50 + CAPS, R_SHF, ENTER, ']', 0, '\\', 0, 0, //58 + 0, 0, 0, 0, 0, 0, BKSP, 0, //60 + 0, '1', 0, '4', '7', 0, 0, 0, //68 + '0', '.', '2', '5', '6', '8', ESC, NUM, //70 + F11, '+', '3', '-', '*', '9', 0, 0 //78 +}; + +const char upperKey[128] = { + 0, F9, 0, F5, F3, F1, F2, F12, //00 + 0, F10, F8, F6, F4, TAB, '~', 0, //08 + 0, 0, L_SHF, 0, L_CTL, 'Q', '!', 0, //10 + 0, 0, 'Z', 'S', 'A', 'W', '@', 0, //18 + 0, 'C', 'X', 'D', 'E', '$', '#', 0, //20 + 0, ' ', 'V', 'F', 'T', 'R', '%', 0, //28 + 0, 'N', 'B', 'H', 'G', 'Y', '^', 0, //30 + 0, 0, 'M', 'J', 'U', '&', '*', 0, //38 + 0, '<', 'K', 'I', 'O', ')', '(', 0, //40 + 0, '>', '?', 'L', ':', 'P', '_', 0, //48 + 0, 0, '\"', 0, '{', '+', 0, 0, //50 + CAPS, R_SHF, ENTER, '}', 0, '|', 0, 0, //58 + 0, 0, 0, 0, 0, 0, BKSP, 0, //60 + 0, '1', 0, '4', '7', 0, 0, 0, //68 + '0', '.', '2', '5', '6', '8', ESC, NUM, //70 + F11, '+', '3', '-', '*', '9', 0, 0 //78 +}; #elif defined RUSSIAN -#include "russian.inc" +// +// Map of standard keyboard, Russian Windows layout +// +const char lowerKey[128]={ + 0, F9, 0, F5, F3, F1, F2, F12, //00 + 0, F10, F8, F6, F4, TAB, 'ё', 0, //08 + 0, 0, L_SHF, 0, L_CTL, 'й', '1', 0, //10 + 0, 0, 'я', 'ы', 'ф', 'ц', '2', 0, //18 + 0, 'с', 'ч', 'в', 'у', '4', '3', 0, //20 + 0, ' ', 'м', 'а', 'е', 'к', '5', 0, //28 + 0, 'т', 'и', 'р', 'п', 'н', '6', 0, //30 + 0, 0, 'ь', 'о', 'г', '7', '8', 0, //38 + 0, 'б', 'л', 'ш', 'щ', '0', '9', 0, //40 + 0, 'ю', '.', 'д', 'ж', 'з', '-', 0, //48 + 0, 0, 'э', 0, 'х', '=', 0, 0, //50 + CAPS, R_SHF, ENTER, 'ъ', 0, '\\', 0, 0, //58 + 0, 0, 0, 0, 0, 0, BKSP, 0, //60 + 0, '1', 0, '4', '7', 0, 0, 0, //68 + '0', ',', '2', '5', '6', '8', ESC, NUM, //70 + F11, '+', '3', '-', '*', '9', 0, 0 //78 +}; + +const char upperKey[128] = { + 0, F9, 0, F5, F3, F1, F2, F12, //00 + 0, F10, F8, F6, F4, TAB, 'Ё', 0, //08 + 0, 0, L_SHF, 0, L_CTL, 'Й', '!', 0, //10 + 0, 0, 'Я', 'Ы', 'Ф', 'Ц', '\"', 0, //18 + 0, 'С', 'Ч', 'В', 'У', ';', '№', 0, //20 + 0, ' ', 'М', 'А', 'Е', 'К', '%', 0, //28 + 0, 'Т', 'И', 'Р', 'П', 'Н', ':', 0, //30 + 0, 0, 'Ь', 'О', 'Г', '?', '*', 0, //38 + 0, 'Б', 'Л', 'Ш', 'Щ', ')', '(', 0, //40 + 0, 'Ю', ',', 'Д', 'Ж', 'З', '_', 0, //48 + 0, 0, 'Э', 0, 'Х', '+', 0, 0, //50 + CAPS, R_SHF, ENTER, 'Ъ', 0, '/', 0, 0, //58 + 0, 0, 0, 0, 0, 0, BKSP, 0, //60 + 0, '1', 0, '4', '7', 0, 0, 0, //68 + '0', ',', '2', '5', '6', '8', ESC, NUM, //70 + F11, '+', '3', '-', '*', '9', 0, 0 //78 +}; #endif /* diff --git a/sys/pic32/kernel-post.mk b/sys/pic32/kernel-post.mk deleted file mode 100644 index 44c0c5b..0000000 --- a/sys/pic32/kernel-post.mk +++ /dev/null @@ -1,64 +0,0 @@ - -DEPFLAGS = -MT $@ -MP -MD -MF .deps/$*.dep -CFLAGS = -I. -I$(H) -O $(DEFS) $(DEPFLAGS) -ASFLAGS = -I. -I$(H) $(DEFS) $(DEPFLAGS) - -include $(BUILDPATH)/gcc-config.mk - -CC = $(MIPS_GCC_PREFIX)gcc -EL -g -mips32r2 -CC += -nostdinc -fno-builtin -Werror -Wall -fno-dwarf2-cfi-asm -LDFLAGS = -nostdlib -SIZE = $(MIPS_GCC_PREFIX)size -OBJDUMP = $(MIPS_GCC_PREFIX)objdump -OBJCOPY = $(MIPS_GCC_PREFIX)objcopy - -DEFS += -DCONFIG=$(CONFIG) - -ifneq (${MIPS_GCC_FORMAT},) - LDFLAGS += -Wl,--oformat=${MIPS_GCC_FORMAT} -endif - -all: .deps sys machine unix.elf - $(SIZE) unix.elf - -clean: - rm -rf .deps *.o *.elf *.bin *.dis *.map *.srec core \ - mklog assym.h vers.c genassym sys machine - -.deps: - mkdir .deps - -sys: - ln -s $(BUILDPATH)/../include $@ - -machine: - ln -s $(BUILDPATH) $@ - -unix.elf: $(KERNOBJ) $(LDSCRIPT) - $(CC) $(LDFLAGS) -T $(LDSCRIPT) -Wl,-Map=unix.map $(KERNOBJ) -o $@ - chmod -x $@ - $(OBJDUMP) -d -S $@ > unix.dis - $(OBJCOPY) -O binary -R .boot -R .config $@ unix.bin - $(OBJCOPY) -O binary -j .boot -j .config $@ boot.bin - test -s boot.bin || rm boot.bin - $(OBJCOPY) -O ihex --change-addresses=0x80000000 $@ unix.hex - chmod -x $@ unix.bin - -load: unix.hex - pic32prog $(BLREBOOT) unix.hex - -vers.o: $(BUILDPATH)/newvers.sh $(H)/*.h $(M)/*.[ch] $(S)/*.c - sh $(BUILDPATH)/newvers.sh > vers.c - $(CC) -c vers.c - -reconfig: - ../../../tools/configsys/config $(CONFIG) - -.SUFFIXES: .i .srec .hex .dis .cpp .cxx .bin .elf - -.o.dis: - $(OBJDUMP) -d -z -S $< > $@ - -ifeq (.deps, $(wildcard .deps)) --include .deps/*.dep -endif diff --git a/sys/pic32/max32/Config b/sys/pic32/max32/Config index be4fc24..1d32f9e 100644 --- a/sys/pic32/max32/Config +++ b/sys/pic32/max32/Config @@ -15,7 +15,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "MAX32" # Board type -ldscript "cfg/bootloader-max32.ld" # Linker script +ldscript "max32/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/max32/Makefile b/sys/pic32/max32/Makefile index 2862981..907db31 100644 --- a/sys/pic32/max32/Makefile +++ b/sys/pic32/max32/Makefile @@ -18,7 +18,7 @@ PARAM += -DLED_KERNEL_PORT=TRISA PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-max32.ld" +LDSCRIPT = "max32/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/cfg/bootloader-max32.ld b/sys/pic32/max32/bootloader.ld similarity index 100% rename from sys/pic32/cfg/bootloader-max32.ld rename to sys/pic32/max32/bootloader.ld diff --git a/sys/pic32/maximite-color/Config b/sys/pic32/maximite-color/Config index abc4a69..5822665 100644 --- a/sys/pic32/maximite-color/Config +++ b/sys/pic32/maximite-color/Config @@ -15,7 +15,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "MAXIMITE_COLOR" # Board type -ldscript "cfg/bootloader-maxcolor.ld" # Linker script +ldscript "maximite-color/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/maximite-color/Makefile b/sys/pic32/maximite-color/Makefile index b8d37a3..b1caa01 100644 --- a/sys/pic32/maximite-color/Makefile +++ b/sys/pic32/maximite-color/Makefile @@ -1,4 +1,4 @@ -PARAM = -DMAXIMITE +PARAM = -DMAXIMITE_COLOR PARAM += -DPIC32MX7 PARAM += -DPWM_ENABLED PARAM += -DADC_ENABLED @@ -19,7 +19,7 @@ PARAM += -DLED_KERNEL_PORT=TRISE PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-maxcolor.ld" +LDSCRIPT = "maximite-color/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/cfg/bootloader-maxcolor.ld b/sys/pic32/maximite-color/bootloader.ld similarity index 100% rename from sys/pic32/cfg/bootloader-maxcolor.ld rename to sys/pic32/maximite-color/bootloader.ld diff --git a/sys/pic32/maximite/Config b/sys/pic32/maximite/Config index de10824..7192dd5 100644 --- a/sys/pic32/maximite/Config +++ b/sys/pic32/maximite/Config @@ -16,7 +16,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "MAXIMITE" # Board type -ldscript "cfg/bootloader-maximite.ld" # Linker script +ldscript "maximite/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/maximite/Makefile b/sys/pic32/maximite/Makefile index 646fdb7..0822f83 100644 --- a/sys/pic32/maximite/Makefile +++ b/sys/pic32/maximite/Makefile @@ -19,7 +19,7 @@ PARAM += -DLED_KERNEL_PORT=TRISF PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-maximite.ld" +LDSCRIPT = "maximite/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/cfg/bootloader-maximite.ld b/sys/pic32/maximite/bootloader.ld similarity index 100% rename from sys/pic32/cfg/bootloader-maximite.ld rename to sys/pic32/maximite/bootloader.ld diff --git a/sys/pic32/maximite/russian.inc b/sys/pic32/maximite/russian.inc deleted file mode 100644 index 17f6a51..0000000 --- a/sys/pic32/maximite/russian.inc +++ /dev/null @@ -1,50 +0,0 @@ -/* - * - * RetroBSD - PS2 keyboard driver for the Maximite PIC32 board - * - * Copyright (C) 2011 Rob Judd - * All rights reserved. The three clause ("New" or "Modified") - * Berkeley software License Agreement specifies the terms and - * conditions for redistribution. - * - */ - -// Map of standard keyboard, Russian Windows layout -const char lowerKey[128]={ - 0, F9, 0, F5, F3, F1, F2, F12, //00 - 0, F10, F8, F6, F4, TAB, 'ё', 0, //08 - 0, 0, L_SHF, 0, L_CTL, 'й', '1', 0, //10 - 0, 0, 'я', 'ы', 'ф', 'ц', '2', 0, //18 - 0, 'с', 'ч', 'в', 'у', '4', '3', 0, //20 - 0, ' ', 'м', 'а', 'е', 'к', '5', 0, //28 - 0, 'т', 'и', 'р', 'п', 'н', '6', 0, //30 - 0, 0, 'ь', 'о', 'г', '7', '8', 0, //38 - 0, 'б', 'л', 'ш', 'щ', '0', '9', 0, //40 - 0, 'ю', '.', 'д', 'ж', 'з', '-', 0, //48 - 0, 0, 'э', 0, 'х', '=', 0, 0, //50 - CAPS, R_SHF, ENTER, 'ъ', 0, '\\', 0, 0, //58 - 0, 0, 0, 0, 0, 0, BKSP, 0, //60 - 0, '1', 0, '4', '7', 0, 0, 0, //68 - '0', ',', '2', '5', '6', '8', ESC, NUM, //70 - F11, '+', '3', '-', '*', '9', 0, 0 //78 - }; - -const char upperKey[128] = { - 0, F9, 0, F5, F3, F1, F2, F12, //00 - 0, F10, F8, F6, F4, TAB, 'Ё', 0, //08 - 0, 0, L_SHF, 0, L_CTL, 'Й', '!', 0, //10 - 0, 0, 'Я', 'Ы', 'Ф', 'Ц', '\"', 0, //18 - 0, 'С', 'Ч', 'В', 'У', ';', '№', 0, //20 - 0, ' ', 'М', 'А', 'Е', 'К', '%', 0, //28 - 0, 'Т', 'И', 'Р', 'П', 'Н', ':', 0, //30 - 0, 0, 'Ь', 'О', 'Г', '?', '*', 0, //38 - 0, 'Б', 'Л', 'Ш', 'Щ', ')', '(', 0, //40 - 0, 'Ю', ',', 'Д', 'Ж', 'З', '_', 0, //48 - 0, 0, 'Э', 0, 'Х', '+', 0, 0, //50 - CAPS, R_SHF, ENTER, 'Ъ', 0, '/', 0, 0, //58 - 0, 0, 0, 0, 0, 0, BKSP, 0, //60 - 0, '1', 0, '4', '7', 0, 0, 0, //68 - '0', ',', '2', '5', '6', '8', ESC, NUM, //70 - F11, '+', '3', '-', '*', '9', 0, 0 //78 - }; - diff --git a/sys/pic32/maximite/usascii.inc b/sys/pic32/maximite/usascii.inc deleted file mode 100644 index 9bfaece..0000000 --- a/sys/pic32/maximite/usascii.inc +++ /dev/null @@ -1,50 +0,0 @@ -/* - * - * RetroBSD - PS2 keyboard driver for the Maximite PIC32 board - * - * Copyright (C) 2011 Rob Judd - * All rights reserved. The three clause ("New" or "Modified") - * Berkeley software License Agreement specifies the terms and - * conditions for redistribution. - * - */ - -// Map of standard keyboard, US ASCII layout -const char lowerKey[128]={ - 0, F9, 0, F5, F3, F1, F2, F12, //00 - 0, F10, F8, F6, F4, TAB, '`', 0, //08 - 0, 0, L_SHF, 0, L_CTL, 'q', '1', 0, //10 - 0, 0, 'z', 's', 'a', 'w', '2', 0, //18 - 0, 'c', 'x', 'd', 'e', '4', '3', 0, //20 - 0, ' ', 'v', 'f', 't', 'r', '5', 0, //28 - 0, 'n', 'b', 'h', 'g', 'y', '6', 0, //30 - 0, 0, 'm', 'j', 'u', '7', '8', 0, //38 - 0, ',', 'k', 'i', 'o', '0', '9', 0, //40 - 0, '.', '/', 'l', ';', 'p', '-', 0, //48 - 0, 0, '\'', 0, '[', '=', 0, 0, //50 - CAPS, R_SHF, ENTER, ']', 0, '\\', 0, 0, //58 - 0, 0, 0, 0, 0, 0, BKSP, 0, //60 - 0, '1', 0, '4', '7', 0, 0, 0, //68 - '0', '.', '2', '5', '6', '8', ESC, NUM, //70 - F11, '+', '3', '-', '*', '9', 0, 0 //78 - }; - -const char upperKey[128] = { - 0, F9, 0, F5, F3, F1, F2, F12, //00 - 0, F10, F8, F6, F4, TAB, '~', 0, //08 - 0, 0, L_SHF, 0, L_CTL, 'Q', '!', 0, //10 - 0, 0, 'Z', 'S', 'A', 'W', '@', 0, //18 - 0, 'C', 'X', 'D', 'E', '$', '#', 0, //20 - 0, ' ', 'V', 'F', 'T', 'R', '%', 0, //28 - 0, 'N', 'B', 'H', 'G', 'Y', '^', 0, //30 - 0, 0, 'M', 'J', 'U', '&', '*', 0, //38 - 0, '<', 'K', 'I', 'O', ')', '(', 0, //40 - 0, '>', '?', 'L', ':', 'P', '_', 0, //48 - 0, 0, '\"', 0, '{', '+', 0, 0, //50 - CAPS, R_SHF, ENTER, '}', 0, '|', 0, 0, //58 - 0, 0, 0, 0, 0, 0, BKSP, 0, //60 - 0, '1', 0, '4', '7', 0, 0, 0, //68 - '0', '.', '2', '5', '6', '8', ESC, NUM, //70 - F11, '+', '3', '-', '*', '9', 0, 0 //78 - }; - diff --git a/sys/pic32/mmb-mx7/Config b/sys/pic32/mmb-mx7/Config index c8318bc..8f83a3f 100644 --- a/sys/pic32/mmb-mx7/Config +++ b/sys/pic32/mmb-mx7/Config @@ -15,7 +15,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "MMB_MX7" # Board type -ldscript "cfg/bootloader.ld" # Linker script +ldscript "mmb-mx7/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/mmb-mx7/Makefile b/sys/pic32/mmb-mx7/Makefile index 114574e..8be1bcb 100644 --- a/sys/pic32/mmb-mx7/Makefile +++ b/sys/pic32/mmb-mx7/Makefile @@ -27,7 +27,7 @@ PARAM += -DLED_KERNEL_PORT=TRISA PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader.ld" +LDSCRIPT = "mmb-mx7/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/cfg/bootloader.ld b/sys/pic32/mmb-mx7/bootloader.ld similarity index 100% rename from sys/pic32/cfg/bootloader.ld rename to sys/pic32/mmb-mx7/bootloader.ld diff --git a/sys/pic32/picadillo/Config b/sys/pic32/picadillo/Config index 712b4ed..0933e60 100644 --- a/sys/pic32/picadillo/Config +++ b/sys/pic32/picadillo/Config @@ -16,7 +16,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "PICADILLO_35T" # Board type -ldscript "cfg/bootloader-max32.ld" # Linker script +ldscript "max32/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/picadillo/Config-rambo b/sys/pic32/picadillo/Config-rambo index 9b723dc..531e6dc 100644 --- a/sys/pic32/picadillo/Config-rambo +++ b/sys/pic32/picadillo/Config-rambo @@ -16,7 +16,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "PICADILLO_35T" # Board type -ldscript "cfg/bootloader-max32.ld" # Linker script +ldscript "max32/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/picadillo/Makefile b/sys/pic32/picadillo/Makefile index d821ddc..48d69b6 100644 --- a/sys/pic32/picadillo/Makefile +++ b/sys/pic32/picadillo/Makefile @@ -14,7 +14,7 @@ PARAM += -DUART1_ENABLED PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-max32.ld" +LDSCRIPT = "max32/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/pinguino-micro/Config b/sys/pic32/pinguino-micro/Config index 5ff9493..62414d1 100644 --- a/sys/pic32/pinguino-micro/Config +++ b/sys/pic32/pinguino-micro/Config @@ -15,7 +15,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "PINGUINO_MICRO" # Board type -ldscript "cfg/bootloader-maximite.ld" # Linker script +ldscript "maximite/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/pinguino-micro/Makefile b/sys/pic32/pinguino-micro/Makefile index 8d35324..abe89fb 100644 --- a/sys/pic32/pinguino-micro/Makefile +++ b/sys/pic32/pinguino-micro/Makefile @@ -17,7 +17,7 @@ PARAM += -DLED_KERNEL_PORT=TRISD PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-maximite.ld" +LDSCRIPT = "maximite/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/sdxl/Config b/sys/pic32/sdxl/Config index 1d67dd6..aa40d50 100644 --- a/sys/pic32/sdxl/Config +++ b/sys/pic32/sdxl/Config @@ -17,7 +17,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "SDXL" # Board type -ldscript "cfg/bootloader-max32.ld" # Linker script +ldscript "max32/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/sdxl/Makefile b/sys/pic32/sdxl/Makefile index 37e16e0..5f49cd5 100644 --- a/sys/pic32/sdxl/Makefile +++ b/sys/pic32/sdxl/Makefile @@ -17,7 +17,7 @@ PARAM += -DLED_KERNEL_PORT=TRISE PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-max32.ld" +LDSCRIPT = "max32/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/starter-kit/Config b/sys/pic32/starter-kit/Config index c8febc0..e931286 100644 --- a/sys/pic32/starter-kit/Config +++ b/sys/pic32/starter-kit/Config @@ -16,7 +16,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "STARTERKIT" # Board type -ldscript "cfg/bare.ld" # Linker script +ldscript "baremetal/script.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/starter-kit/Makefile b/sys/pic32/starter-kit/Makefile index 8244394..993fbd8 100644 --- a/sys/pic32/starter-kit/Makefile +++ b/sys/pic32/starter-kit/Makefile @@ -18,7 +18,7 @@ PARAM += -DLED_DISK_PORT=TRISD PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bare.ld" +LDSCRIPT = "baremetal/script.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/ubw32/Config b/sys/pic32/ubw32/Config index 6d736ce..ce9fac0 100644 --- a/sys/pic32/ubw32/Config +++ b/sys/pic32/ubw32/Config @@ -17,7 +17,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "UBW32" # Board type -ldscript "cfg/bootloader-ubw32.ld" # Linker script +ldscript "ubw32/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/ubw32/Config-uart b/sys/pic32/ubw32/Config-uart index 9d908ed..29b3e11 100644 --- a/sys/pic32/ubw32/Config-uart +++ b/sys/pic32/ubw32/Config-uart @@ -16,7 +16,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "UBW32" # Board type -ldscript "cfg/bootloader-ubw32.ld" # Linker script +ldscript "ubw32/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/ubw32/Makefile b/sys/pic32/ubw32/Makefile index efcd18b..5ddf092 100644 --- a/sys/pic32/ubw32/Makefile +++ b/sys/pic32/ubw32/Makefile @@ -29,7 +29,7 @@ PARAM += -DLED_KERNEL_PORT=TRISE PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-ubw32.ld" +LDSCRIPT = "ubw32/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/sys/pic32/cfg/bootloader-ubw32.ld b/sys/pic32/ubw32/bootloader.ld similarity index 100% rename from sys/pic32/cfg/bootloader-ubw32.ld rename to sys/pic32/ubw32/bootloader.ld diff --git a/sys/pic32/wf32/Config b/sys/pic32/wf32/Config index 320d470..5beec81 100644 --- a/sys/pic32/wf32/Config +++ b/sys/pic32/wf32/Config @@ -13,7 +13,7 @@ architecture "pic32" cpu "PIC32MX7" # Processor variant board "WF32" # Board type -ldscript "cfg/bootloader-max32.ld" # Linker script +ldscript "max32/bootloader.ld" # Linker script # Standard system options options "CPU_KHZ=80000" # Oscillator frequency of CPU core diff --git a/sys/pic32/wf32/Makefile b/sys/pic32/wf32/Makefile index 39b85f7..50e5b89 100644 --- a/sys/pic32/wf32/Makefile +++ b/sys/pic32/wf32/Makefile @@ -19,7 +19,7 @@ PARAM += -DLED_KERNEL_PORT=TRISA PARAM += -DBUS_DIV=1 PARAM += -DBUS_KHZ=80000 PARAM += -DCPU_KHZ=80000 -LDSCRIPT = "cfg/bootloader-max32.ld" +LDSCRIPT = "max32/bootloader.ld" # # Makefile for RetroBSD, pic32 target # diff --git a/tools/Makefile b/tools/Makefile index 4218b65..94d3e23 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ -SUBDIR = elf2aout fsutil virtualmips mkrd configsys kconfig icache +SUBDIR = elf2aout fsutil virtualmips mkrd kconfig icache all install depend: ${SUBDIR} -for i in ${SUBDIR}; do ${MAKE} -C $$i ${MFLAGS} DESTDIR=${DESTDIR} $@; done diff --git a/sys/pic32/32mxsdram/32MXSDRAM b/tools/configsys/board/32MXSDRAM-UART similarity index 100% rename from sys/pic32/32mxsdram/32MXSDRAM rename to tools/configsys/board/32MXSDRAM-UART diff --git a/sys/pic32/baremetal/BAREMETAL b/tools/configsys/board/BAREMETAL similarity index 100% rename from sys/pic32/baremetal/BAREMETAL rename to tools/configsys/board/BAREMETAL diff --git a/sys/pic32/duinomite/DUINOMITE b/tools/configsys/board/DUINOMITE similarity index 100% rename from sys/pic32/duinomite/DUINOMITE rename to tools/configsys/board/DUINOMITE diff --git a/sys/pic32/duinomite-emega/DUINOMITE-EMEGA b/tools/configsys/board/DUINOMITE-E similarity index 100% rename from sys/pic32/duinomite-emega/DUINOMITE-EMEGA rename to tools/configsys/board/DUINOMITE-E diff --git a/sys/pic32/duinomite-emega/DUINOMITE-EMEGA-UART b/tools/configsys/board/DUINOMITE-E-UART similarity index 100% rename from sys/pic32/duinomite-emega/DUINOMITE-EMEGA-UART rename to tools/configsys/board/DUINOMITE-E-UART diff --git a/sys/pic32/duinomite/DUINOMITE-UART b/tools/configsys/board/DUINOMITE-UART similarity index 100% rename from sys/pic32/duinomite/DUINOMITE-UART rename to tools/configsys/board/DUINOMITE-UART diff --git a/sys/pic32/explorer16/EXPLORER16 b/tools/configsys/board/EXPLORER16 similarity index 100% rename from sys/pic32/explorer16/EXPLORER16 rename to tools/configsys/board/EXPLORER16 diff --git a/sys/pic32/fubarino/FUBARINO b/tools/configsys/board/FUBARINO similarity index 100% rename from sys/pic32/fubarino/FUBARINO rename to tools/configsys/board/FUBARINO diff --git a/sys/pic32/fubarino/FUBARINO-UART2CONS-UART1-SRAMC b/tools/configsys/board/FUBARINO-UART2CONS-UART1-SRAMC similarity index 100% rename from sys/pic32/fubarino/FUBARINO-UART2CONS-UART1-SRAMC rename to tools/configsys/board/FUBARINO-UART2CONS-UART1-SRAMC diff --git a/sys/pic32/max32/MAX32 b/tools/configsys/board/MAX32 similarity index 100% rename from sys/pic32/max32/MAX32 rename to tools/configsys/board/MAX32 diff --git a/sys/pic32/maximite/MAXIMITE b/tools/configsys/board/MAXIMITE similarity index 100% rename from sys/pic32/maximite/MAXIMITE rename to tools/configsys/board/MAXIMITE diff --git a/sys/pic32/maximite-color/MAXIMITE-COLOR b/tools/configsys/board/MAXIMITE-COLOR similarity index 100% rename from sys/pic32/maximite-color/MAXIMITE-COLOR rename to tools/configsys/board/MAXIMITE-COLOR diff --git a/tools/configsys/board/MEB b/tools/configsys/board/MEB new file mode 100644 index 0000000..8ffeb7b --- /dev/null +++ b/tools/configsys/board/MEB @@ -0,0 +1,17 @@ + + +core pic32mx7 +linker bootloader +mapping generic + +device kernel cpu_khz=80000 bus_khz=80000 led=D2 + +device console device=ttyUSB0 led=D0 +device uartusb + +device rdisk led=D1 +device sd0 port=1 cs=A9 + +device gpio + +#device adc diff --git a/sys/pic32/mmb-mx7/MMB-MX7 b/tools/configsys/board/MMB-MX7 similarity index 100% rename from sys/pic32/mmb-mx7/MMB-MX7 rename to tools/configsys/board/MMB-MX7 diff --git a/sys/pic32/picadillo/PICADILLO b/tools/configsys/board/PICADILLO similarity index 86% rename from sys/pic32/picadillo/PICADILLO rename to tools/configsys/board/PICADILLO index e036a10..5fd32a7 100644 --- a/sys/pic32/picadillo/PICADILLO +++ b/tools/configsys/board/PICADILLO @@ -2,8 +2,8 @@ # Picadillo 35T board # =================== # -# Console on UART1. -# SD/MMC card driver on SPI2. +# Console on UART1 +# SD/MMC card driver on SPI2 core pic32mx7 mapping picadillo diff --git a/sys/pic32/picadillo/PICADILLO-RAMBO b/tools/configsys/board/PICADILLO-RAMBO similarity index 86% rename from sys/pic32/picadillo/PICADILLO-RAMBO rename to tools/configsys/board/PICADILLO-RAMBO index 66ddc86..9e8dd20 100644 --- a/sys/pic32/picadillo/PICADILLO-RAMBO +++ b/tools/configsys/board/PICADILLO-RAMBO @@ -1,10 +1,6 @@ # # Picadillo 35T board # =================== -# -# Console on TFT display. -# SD/MMC card driver on SPI2. -# SPI RAM on SPI4. core pic32mx7 mapping picadillo diff --git a/sys/pic32/pinguino-micro/PINGUINO-MICRO b/tools/configsys/board/PINGUINO-MICRO similarity index 100% rename from sys/pic32/pinguino-micro/PINGUINO-MICRO rename to tools/configsys/board/PINGUINO-MICRO diff --git a/sys/pic32/sdxl/SDXL b/tools/configsys/board/SDXL similarity index 100% rename from sys/pic32/sdxl/SDXL rename to tools/configsys/board/SDXL diff --git a/sys/pic32/starter-kit/STARTER-KIT b/tools/configsys/board/STARTER-KIT similarity index 100% rename from sys/pic32/starter-kit/STARTER-KIT rename to tools/configsys/board/STARTER-KIT diff --git a/sys/pic32/ubw32/UBW32 b/tools/configsys/board/UBW32 similarity index 100% rename from sys/pic32/ubw32/UBW32 rename to tools/configsys/board/UBW32 diff --git a/sys/pic32/ubw32/UBW32-UART b/tools/configsys/board/UBW32-UART similarity index 100% rename from sys/pic32/ubw32/UBW32-UART rename to tools/configsys/board/UBW32-UART diff --git a/tools/configsys/board/UBW32-UART-SDRAM b/tools/configsys/board/UBW32-UART-SDRAM new file mode 100644 index 0000000..6b0d452 --- /dev/null +++ b/tools/configsys/board/UBW32-UART-SDRAM @@ -0,0 +1,18 @@ +# +# UBW32 board +# =========== +# +# Console on UART2 + +core pic32mx7 +linker bootloader-sdram +mapping generic + +device kernel invled=B10 +device console invled=B11 device=tty1 +device uart2 +device rdisk invled=B9 invswap=B8 +device sd0 port=2 cs=A9 +device sdramp + +option PARTITION=sdramp0:sa@2048,fs@14000 diff --git a/sys/pic32/wf32/WF32 b/tools/configsys/board/WF32 similarity index 87% rename from sys/pic32/wf32/WF32 rename to tools/configsys/board/WF32 index 7253c86..4778b41 100644 --- a/sys/pic32/wf32/WF32 +++ b/tools/configsys/board/WF32 @@ -1,6 +1,5 @@ # # 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 diff --git a/sys/pic32/cfg/adc.dev b/tools/configsys/dev/adc.dev similarity index 100% rename from sys/pic32/cfg/adc.dev rename to tools/configsys/dev/adc.dev diff --git a/sys/pic32/cfg/console.dev b/tools/configsys/dev/console.dev similarity index 100% rename from sys/pic32/cfg/console.dev rename to tools/configsys/dev/console.dev diff --git a/sys/pic32/cfg/devcfg.dev b/tools/configsys/dev/devcfg.dev similarity index 100% rename from sys/pic32/cfg/devcfg.dev rename to tools/configsys/dev/devcfg.dev diff --git a/sys/pic32/cfg/foreignbootloader.dev b/tools/configsys/dev/foreignbootloader.dev similarity index 100% rename from sys/pic32/cfg/foreignbootloader.dev rename to tools/configsys/dev/foreignbootloader.dev diff --git a/sys/pic32/cfg/glcd.dev b/tools/configsys/dev/glcd.dev similarity index 100% rename from sys/pic32/cfg/glcd.dev rename to tools/configsys/dev/glcd.dev diff --git a/sys/pic32/cfg/glob.dev b/tools/configsys/dev/glob.dev similarity index 100% rename from sys/pic32/cfg/glob.dev rename to tools/configsys/dev/glob.dev diff --git a/sys/pic32/cfg/global.dev b/tools/configsys/dev/global.dev similarity index 100% rename from sys/pic32/cfg/global.dev rename to tools/configsys/dev/global.dev diff --git a/sys/pic32/cfg/gpio.dev b/tools/configsys/dev/gpio.dev similarity index 100% rename from sys/pic32/cfg/gpio.dev rename to tools/configsys/dev/gpio.dev diff --git a/sys/pic32/cfg/hxtft.dev b/tools/configsys/dev/hxtft.dev similarity index 100% rename from sys/pic32/cfg/hxtft.dev rename to tools/configsys/dev/hxtft.dev diff --git a/sys/pic32/cfg/kernel.dev b/tools/configsys/dev/kernel.dev similarity index 100% rename from sys/pic32/cfg/kernel.dev rename to tools/configsys/dev/kernel.dev diff --git a/sys/pic32/cfg/log.dev b/tools/configsys/dev/log.dev similarity index 100% rename from sys/pic32/cfg/log.dev rename to tools/configsys/dev/log.dev diff --git a/sys/pic32/cfg/mrams.dev b/tools/configsys/dev/mrams.dev similarity index 100% rename from sys/pic32/cfg/mrams.dev rename to tools/configsys/dev/mrams.dev diff --git a/sys/pic32/cfg/picga.dev b/tools/configsys/dev/picga.dev similarity index 100% rename from sys/pic32/cfg/picga.dev rename to tools/configsys/dev/picga.dev diff --git a/sys/pic32/cfg/power.dev b/tools/configsys/dev/power.dev similarity index 100% rename from sys/pic32/cfg/power.dev rename to tools/configsys/dev/power.dev diff --git a/sys/pic32/cfg/pty.dev b/tools/configsys/dev/pty.dev similarity index 100% rename from sys/pic32/cfg/pty.dev rename to tools/configsys/dev/pty.dev diff --git a/sys/pic32/cfg/pwm.dev b/tools/configsys/dev/pwm.dev similarity index 100% rename from sys/pic32/cfg/pwm.dev rename to tools/configsys/dev/pwm.dev diff --git a/sys/pic32/cfg/rdisk.dev b/tools/configsys/dev/rdisk.dev similarity index 100% rename from sys/pic32/cfg/rdisk.dev rename to tools/configsys/dev/rdisk.dev diff --git a/sys/pic32/cfg/sd.dev b/tools/configsys/dev/sd.dev similarity index 100% rename from sys/pic32/cfg/sd.dev rename to tools/configsys/dev/sd.dev diff --git a/sys/pic32/cfg/sdramp.dev b/tools/configsys/dev/sdramp.dev similarity index 100% rename from sys/pic32/cfg/sdramp.dev rename to tools/configsys/dev/sdramp.dev diff --git a/sys/pic32/cfg/skel.dev b/tools/configsys/dev/skel.dev similarity index 100% rename from sys/pic32/cfg/skel.dev rename to tools/configsys/dev/skel.dev diff --git a/sys/pic32/cfg/spi.dev b/tools/configsys/dev/spi.dev similarity index 100% rename from sys/pic32/cfg/spi.dev rename to tools/configsys/dev/spi.dev diff --git a/sys/pic32/cfg/spibus.dev b/tools/configsys/dev/spibus.dev similarity index 100% rename from sys/pic32/cfg/spibus.dev rename to tools/configsys/dev/spibus.dev diff --git a/sys/pic32/cfg/spirams.dev b/tools/configsys/dev/spirams.dev similarity index 100% rename from sys/pic32/cfg/spirams.dev rename to tools/configsys/dev/spirams.dev diff --git a/sys/pic32/cfg/sramc.dev b/tools/configsys/dev/sramc.dev similarity index 100% rename from sys/pic32/cfg/sramc.dev rename to tools/configsys/dev/sramc.dev diff --git a/sys/pic32/cfg/tty.dev b/tools/configsys/dev/tty.dev similarity index 100% rename from sys/pic32/cfg/tty.dev rename to tools/configsys/dev/tty.dev diff --git a/sys/pic32/cfg/uart.dev b/tools/configsys/dev/uart.dev similarity index 100% rename from sys/pic32/cfg/uart.dev rename to tools/configsys/dev/uart.dev diff --git a/sys/pic32/cfg/uartconsole.dev b/tools/configsys/dev/uartconsole.dev similarity index 100% rename from sys/pic32/cfg/uartconsole.dev rename to tools/configsys/dev/uartconsole.dev diff --git a/sys/pic32/cfg/uartusb.dev b/tools/configsys/dev/uartusb.dev similarity index 100% rename from sys/pic32/cfg/uartusb.dev rename to tools/configsys/dev/uartusb.dev diff --git a/sys/pic32/cfg/ufs.dev b/tools/configsys/dev/ufs.dev similarity index 100% rename from sys/pic32/cfg/ufs.dev rename to tools/configsys/dev/ufs.dev diff --git a/sys/pic32/cfg/usbconsole.dev b/tools/configsys/dev/usbconsole.dev similarity index 100% rename from sys/pic32/cfg/usbconsole.dev rename to tools/configsys/dev/usbconsole.dev diff --git a/sys/pic32/cfg/fubarino.map b/tools/configsys/map/fubarino.map similarity index 100% rename from sys/pic32/cfg/fubarino.map rename to tools/configsys/map/fubarino.map diff --git a/sys/pic32/cfg/generic.map b/tools/configsys/map/generic.map similarity index 100% rename from sys/pic32/cfg/generic.map rename to tools/configsys/map/generic.map diff --git a/sys/pic32/cfg/max32.map b/tools/configsys/map/max32.map similarity index 100% rename from sys/pic32/cfg/max32.map rename to tools/configsys/map/max32.map diff --git a/sys/pic32/cfg/picadillo.map b/tools/configsys/map/picadillo.map similarity index 100% rename from sys/pic32/cfg/picadillo.map rename to tools/configsys/map/picadillo.map diff --git a/sys/pic32/cfg/wf32.map b/tools/configsys/map/wf32.map similarity index 100% rename from sys/pic32/cfg/wf32.map rename to tools/configsys/map/wf32.map