Switch to kconfig completely.

All configsys stuff moved to tools/configsys/ directory, not used anymore.

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

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
 #

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

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

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
 #

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

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

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
 #

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

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

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
 #

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

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
 #

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

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

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
 #

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
 
 /*

sys/pic32/kernel-post.mk

@@ -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

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

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
 #

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

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
 #

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

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
 #

sys/pic32/maximite/russian.inc

@@ -1,50 +0,0 @@
-/*
- *
- * RetroBSD - PS2 keyboard driver for the Maximite PIC32 board
- *
- * Copyright (C) 2011 Rob Judd <judd@ob-wan.com>
- * 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
-            };
-

sys/pic32/maximite/usascii.inc

@@ -1,50 +0,0 @@
-/*
- *
- * RetroBSD - PS2 keyboard driver for the Maximite PIC32 board
- *
- * Copyright (C) 2011 Rob Judd <judd@ob-wan.com>
- * 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
-            };
-

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

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
 #

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

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

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
 #

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

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
 #

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

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
 #

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

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
 #

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

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

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
 #

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

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
 #

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

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

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

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

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

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