From 470624fa7829e323f00172dbda4c241bd234e5d0 Mon Sep 17 00:00:00 2001 From: Brennan Ashton Date: Sun, 19 Jul 2020 06:14:45 +0000 Subject: [PATCH] Use AVR Linux toolchain instead of buildroot Signed-off-by: Brennan Ashton --- boards/avr/at90usb/micropendous3/configs/hello/defconfig | 3 +-- boards/avr/at90usb/teensy-2.0/configs/hello/defconfig | 3 +-- boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig | 3 +-- boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig | 5 ++--- boards/avr/atmega/amber/configs/hello/defconfig | 3 +-- boards/avr/atmega/arduino-mega2560/configs/hello/defconfig | 2 +- boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig | 4 +--- boards/avr/atmega/moteino-mega/configs/hello/defconfig | 2 +- boards/avr/atmega/moteino-mega/configs/nsh/defconfig | 2 +- 9 files changed, 10 insertions(+), 17 deletions(-) diff --git a/boards/avr/at90usb/micropendous3/configs/hello/defconfig b/boards/avr/at90usb/micropendous3/configs/hello/defconfig index bb1a8a7e6c..8cb9ea4690 100644 --- a/boards/avr/at90usb/micropendous3/configs/hello/defconfig +++ b/boards/avr/at90usb/micropendous3/configs/hello/defconfig @@ -13,7 +13,7 @@ CONFIG_ARCH_CHIP="at90usb" CONFIG_ARCH_CHIP_AT90USB647=y CONFIG_ARCH_CHIP_AT90USB=y CONFIG_ARCH_STACKDUMP=y -CONFIG_AVR_BUILDROOT_TOOLCHAIN=y +CONFIG_AVR_LINUXGCC_TOOLCHAIN=y CONFIG_AVR_USART1=y CONFIG_BOARD_LOOPSPERMSEC=864 CONFIG_CONSOLE_SYSLOG=y @@ -22,7 +22,6 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y -CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=4 diff --git a/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig index d1ad26ca2a..56dedb7ef6 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig @@ -13,7 +13,7 @@ CONFIG_ARCH_CHIP="at90usb" CONFIG_ARCH_CHIP_AT90USB1286=y CONFIG_ARCH_CHIP_AT90USB=y CONFIG_ARCH_STACKDUMP=y -CONFIG_AVR_BUILDROOT_TOOLCHAIN=y +CONFIG_AVR_LINUXGCC_TOOLCHAIN=y CONFIG_AVR_USART1=y CONFIG_BOARD_LOOPSPERMSEC=864 CONFIG_CONSOLE_SYSLOG=y @@ -22,7 +22,6 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y -CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=4 diff --git a/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig b/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig index b4d07de4c9..77af417893 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig @@ -17,14 +17,13 @@ CONFIG_ARCH_CHIP="at90usb" CONFIG_ARCH_CHIP_AT90USB1286=y CONFIG_ARCH_CHIP_AT90USB=y CONFIG_ARCH_STACKDUMP=y -CONFIG_AVR_BUILDROOT_TOOLCHAIN=y +CONFIG_AVR_LINUXGCC_TOOLCHAIN=y CONFIG_AVR_USART1=y CONFIG_BOARD_LOOPSPERMSEC=864 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y -CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=8 diff --git a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig index 02fb33760f..dead46c040 100644 --- a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig +++ b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig @@ -14,7 +14,7 @@ CONFIG_ARCH_CHIP="at90usb" CONFIG_ARCH_CHIP_AT90USB1286=y CONFIG_ARCH_CHIP_AT90USB=y CONFIG_ARCH_STACKDUMP=y -CONFIG_AVR_BUILDROOT_TOOLCHAIN=y +CONFIG_AVR_LINUXGCC_TOOLCHAIN=y CONFIG_AVR_SPI=y CONFIG_AVR_USART1=y CONFIG_AVR_USBDEV=y @@ -22,7 +22,6 @@ CONFIG_BOARD_LOOPSPERMSEC=864 CONFIG_CONSOLE_SYSLOG=y CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MQUEUE=y -CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_LIB_BOARDCTL=y @@ -32,7 +31,6 @@ CONFIG_MMCSD=y CONFIG_MMCSD_SPICLOCK=12500000 CONFIG_NFILE_DESCRIPTORS=6 CONFIG_NFILE_STREAMS=6 -CONFIG_TLS_NELEM=0 CONFIG_NUNGET_CHARS=0 CONFIG_PREALLOC_TIMERS=0 CONFIG_PREALLOC_WDOGS=6 @@ -48,6 +46,7 @@ CONFIG_START_YEAR=2011 CONFIG_STDIO_DISABLE_BUFFERING=y CONFIG_SYSTEM_USBMSC=y CONFIG_TASK_NAME_SIZE=0 +CONFIG_TLS_NELEM=0 CONFIG_USART1_BAUD=38400 CONFIG_USART1_SERIAL_CONSOLE=y CONFIG_USBDEV=y diff --git a/boards/avr/atmega/amber/configs/hello/defconfig b/boards/avr/atmega/amber/configs/hello/defconfig index 28d95e0799..aed003f2c9 100644 --- a/boards/avr/atmega/amber/configs/hello/defconfig +++ b/boards/avr/atmega/amber/configs/hello/defconfig @@ -13,7 +13,7 @@ CONFIG_ARCH_CHIP="atmega" CONFIG_ARCH_CHIP_ATMEGA128=y CONFIG_ARCH_CHIP_ATMEGA=y CONFIG_ARCH_STACKDUMP=y -CONFIG_AVR_BUILDROOT_TOOLCHAIN=y +CONFIG_AVR_LINUXGCC_TOOLCHAIN=y CONFIG_AVR_USART0=y CONFIG_BOARD_LOOPSPERMSEC=800 CONFIG_CONSOLE_SYSLOG=y @@ -22,7 +22,6 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y -CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=4 diff --git a/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig index d8cea7ef25..299fe12a72 100644 --- a/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig +++ b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH_CHIP="atmega" CONFIG_ARCH_CHIP_ATMEGA2560=y CONFIG_ARCH_CHIP_ATMEGA=y CONFIG_ARCH_STACKDUMP=y +CONFIG_AVR_LINUXGCC_TOOLCHAIN=y CONFIG_AVR_USART0=y CONFIG_BOARD_LOOPSPERMSEC=800 CONFIG_CONSOLE_SYSLOG=y @@ -23,7 +24,6 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y -CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=128 CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=4 diff --git a/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig b/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig index 12f1021a09..9d7437801a 100644 --- a/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig +++ b/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig @@ -5,7 +5,6 @@ # You can then do "make savedefconfig" to generate a new defconfig file that includes your # modifications. # -# CONFIG_AVR_HAS_MEMX_PTR is not set CONFIG_ARCH="avr" CONFIG_ARCH_AVR=y CONFIG_ARCH_BOARD="arduino-mega2560" @@ -14,7 +13,7 @@ CONFIG_ARCH_CHIP="atmega" CONFIG_ARCH_CHIP_ATMEGA2560=y CONFIG_ARCH_CHIP_ATMEGA=y CONFIG_ARCH_STACKDUMP=y -CONFIG_AVR_ATMEL_AVR_TOOLCHAIN=y +CONFIG_AVR_LINUXGCC_TOOLCHAIN=y CONFIG_AVR_USART0=y CONFIG_BOARD_LOOPSPERMSEC=800 CONFIG_DEBUG_FULLOPT=y @@ -23,7 +22,6 @@ CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y -CONFIG_HOST_WINDOWS=y CONFIG_IDLETHREAD_STACKSIZE=128 CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=4 diff --git a/boards/avr/atmega/moteino-mega/configs/hello/defconfig b/boards/avr/atmega/moteino-mega/configs/hello/defconfig index edf01203cb..c02de80f64 100644 --- a/boards/avr/atmega/moteino-mega/configs/hello/defconfig +++ b/boards/avr/atmega/moteino-mega/configs/hello/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH_CHIP="atmega" CONFIG_ARCH_CHIP_ATMEGA1284P=y CONFIG_ARCH_CHIP_ATMEGA=y CONFIG_ARCH_STACKDUMP=y +CONFIG_AVR_LINUXGCC_TOOLCHAIN=y CONFIG_AVR_USART0=y CONFIG_BOARD_LOOPSPERMSEC=888 CONFIG_CONSOLE_SYSLOG=y @@ -21,7 +22,6 @@ CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y CONFIG_EXAMPLES_HELLO=y -CONFIG_HOST_MACOS=y CONFIG_IDLETHREAD_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=4 diff --git a/boards/avr/atmega/moteino-mega/configs/nsh/defconfig b/boards/avr/atmega/moteino-mega/configs/nsh/defconfig index a367f85afa..9b7e6f1e20 100644 --- a/boards/avr/atmega/moteino-mega/configs/nsh/defconfig +++ b/boards/avr/atmega/moteino-mega/configs/nsh/defconfig @@ -17,13 +17,13 @@ CONFIG_ARCH_CHIP="atmega" CONFIG_ARCH_CHIP_ATMEGA1284P=y CONFIG_ARCH_CHIP_ATMEGA=y CONFIG_ARCH_STACKDUMP=y +CONFIG_AVR_LINUXGCC_TOOLCHAIN=y CONFIG_AVR_USART0=y CONFIG_BOARD_LOOPSPERMSEC=888 CONFIG_DEFAULT_SMALL=y CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_PTHREAD=y -CONFIG_HOST_MACOS=y CONFIG_IDLETHREAD_STACKSIZE=512 CONFIG_INTELHEX_BINARY=y CONFIG_MAX_TASKS=8