The goal is to synchronize with Pavel Pisa's sysless from uLAN project.
Their sysless is roughly based on our sysless but evolves more rapidly
(and does not contain so much crap :-). With this commit I want to get
their updates of the common code base to this repository.
This is only an initial attempt with all conflict resolved "somehow".
Compilation errors will be resolved in follow up commits.
Conflicts:
arch/Makefile.omk
arch/arm/Makefile.omk
arch/arm/generic/Makefile.omk
arch/arm/generic/defines/Makefile.omk
arch/arm/generic/defines/cpu_def.h
arch/arm/generic/libs/misc/Makefile.omk
arch/arm/generic/libs/misc/system_stub.h
arch/arm/mach-at91sam7/Makefile.omk
arch/arm/mach-lpc13xx/Makefile
arch/arm/mach-lpc13xx/Makefile.omk
arch/arm/mach-lpc13xx/defines/Makefile.omk
arch/arm/mach-lpc13xx/defines/core_cm3.h
arch/arm/mach-lpc13xx/libs/Makefile
arch/arm/mach-lpc13xx/libs/Makefile.omk
arch/arm/mach-lpc17xx/defines/Makefile.omk
arch/arm/mach-lpc17xx/libs/hal/Makefile.omk
arch/arm/mach-lpc17xx/libs/hal/hal.c
arch/arm/mach-lpc17xx/libs/hal/hal_machperiph.c
arch/arm/mach-lpc17xx/libs/hal/hal_machperiph.h
arch/arm/mach-lpc17xx/libs/hal/startup.c
arch/arm/mach-lpc21xx/Makefile.omk
arch/arm/mach-lpc21xx/defines/LPC210x.h
arch/arm/mach-lpc21xx/defines/LPC214x.h
arch/arm/mach-lpc21xx/defines/LPC21xx.h
arch/arm/mach-lpc21xx/defines/LPC22xx.h
arch/arm/mach-lpc21xx/defines/armVIC.h
arch/arm/mach-lpc21xx/defines/lpcADC.h
arch/arm/mach-lpc21xx/defines/lpcEMC.h
arch/arm/mach-lpc21xx/defines/lpcGPIO.h
arch/arm/mach-lpc21xx/defines/lpcI2C.h
arch/arm/mach-lpc21xx/defines/lpcPIN.h
arch/arm/mach-lpc21xx/defines/lpcRTC.h
arch/arm/mach-lpc21xx/defines/lpcSCB.h
arch/arm/mach-lpc21xx/defines/lpcSPI.h
arch/arm/mach-lpc21xx/defines/lpcTMR.h
arch/arm/mach-lpc21xx/defines/lpcUART.h
arch/arm/mach-lpc21xx/defines/lpcUSB.h
arch/arm/mach-lpc21xx/defines/lpcVIC.h
arch/arm/mach-lpc21xx/defines/lpcWD.h
arch/arm/mach-lpc21xx/libs/Makefile.omk
arch/arm/mach-lpc23xx/Makefile.omk
arch/arm/mach-lpc23xx/defines/Makefile
arch/arm/mach-lpc23xx/defines/lpcI2C.h
arch/arm/mach-lpc23xx/libs/Makefile.omk
arch/generic/Makefile.omk
arch/generic/defines/Makefile.omk
arch/generic/defines/endian.h
arch/generic/defines/irq_generic.h
arch/generic/defines/keyval_id_his.h
arch/generic/defines/lt_timer.h
arch/generic/defines/lt_timer_types.h
arch/h8300/generic/Makefile.omk
arch/h8300/generic/bloader/bloader.c
arch/h8300/generic/drivers/bit_iic.c
arch/h8300/generic/drivers/h8_iic.c
arch/h8300/generic/drivers/periph/iic_ifc.h
arch/h8300/generic/drivers/periph/sci_rs232.h
arch/h8300/generic/drivers/sci_rs232.c
arch/h8300/generic/libs/boot/boot.c
arch/h8300/generic/libs/boot/boot_fn.c
arch/h8300/generic/libs/boot/boot_fn.h
arch/h8300/generic/libs/boot/loader.c
arch/h8300/generic/libs/misc/excptvec.c
arch/h8300/generic/libs/misc/system_stub.c
arch/h8300/generic/tools/tohit/hiterm.c
arch/h8300/mach-2633/defines/h8s2633h.h
arch/h8300/mach-2633/drivers/periph/sci_regs.h
arch/h8300/mach-2638/defines/h8s2638h.h
arch/h8300/mach-2638/drivers/periph/sci_regs.h
board/Makefile.omk
board/arm/lpc17xx-common/defines/system_def-ulmi.h
board/arm/lpc17xx-common/libs/bspbase/bsp0hwinit.c
board/arm/lpc17xx-common/libs/bspbase/bspbase.h
board/arm/lpc17xx-common/libs/bspbase/uart.c
board/arm/lpc17xx-common/libs/bspbase/uart.h
board/arm/lpc17xx-common/libs/ldscripts/lpc1754.ld-app
board/arm/lpc17xx-common/libs/ldscripts/lpc1754.ld-boot
board/arm/lpc17xx-common/libs/ldscripts/lpc1754.ld-cfg
board/h8300/edk2638/defines/system_def.h
board/h8300/edk2638/defines/system_def_edk2638.h
board/h8300/edk2638/libs/bspbase/bsp0common.c
board/h8300/edk2638/libs/bspbase/bsp0hwinit.c
board/h8300/h8canusb/defines/system_def.h
board/h8300/h8canusb/defines/system_def_h8canusb.h
board/h8300/h8canusb/libs/bspbase/bsp0common.c
board/h8300/h8canusb/libs/bspbase/bsp0hwinit.c
board/h8300/h8eurobot/config/config.h8eurobot
board/h8300/h8eurobot/defines/system_def.h
board/h8300/h8eurobot/defines/system_def_h8eurobot.h
board/h8300/h8eurobot/libs/bspbase/bsp0common.c
board/h8300/h8eurobot/libs/bspbase/bsp0hwinit.c
board/h8300/h8heli/defines/system_def.h
board/h8300/h8heli/libs/bspbase/bsp0common.c
board/h8300/h8heli/libs/bspbase/bsp0hwinit.c
board/h8300/h8heli/servodrv/mycan.c
board/h8300/h8heli/servodrv/mycan_old.c
board/h8300/h8heli/servodrv/servodrv.c
board/h8300/h8heli/servodrv/servoout.c
board/h8300/h8mirosot/defines/system_def.h
board/h8300/h8mirosot/defines/system_def_h8mirosot.h
board/h8300/h8mirosot/libs/bspbase/bsp0common.c
board/h8300/h8mirosot/libs/bspbase/bsp0hwinit.c
board/h8300/hi_cpu2/config.hi_cpu2
board/h8300/hi_cpu2/defines/system_def.h
board/h8300/hi_cpu2/defines/system_def_hi_cpu2.h
board/h8300/hi_cpu2/libs/bspbase/bsp0common.c
board/h8300/hi_cpu2/libs/bspbase/bsp0hwinit.c
board/h8300/hi_cpu2/libs/hi_cpu2.ld-bload
board/h8300/hi_cpu2/libs/hi_cpu2.ld-boot
board/h8300/hi_cpu2/libs/hi_cpu2.ld-flash
board/h8300/hi_cpu2/libs/hi_cpu2.ld-flashnoram
board/h8300/jt_usb1/defines/system_def.h
board/h8300/jt_usb1/defines/system_def_jt_usb1.h
board/h8300/jt_usb1/libs/bspbase/bsp0common.c
board/h8300/jt_usb1/libs/bspbase/bsp0hwinit.c
libs4c/cmdproc/Makefile.omk
libs4c/cmdproc/cmd_io.c
libs4c/cmdproc/cmd_io_line.c
libs4c/cmdproc/cmd_proc.c
libs4c/cmdproc/cmd_proc.h
libs4c/cmdproc/cmdio_std_file.c
libs4c/cmdproc/cmdio_std_line.c
libs4c/keyval/keyvalpb.h
libs4c/misc/Makefile.omk
libs4c/misc/utils.c
libs4c/misc/utils.h
libs4c/usb/base/usb.c
libs4c/usb/base/usb/usb.h
libs4c/usb/base/usb/usb_spec.h
libs4c/usb/base/usb/usbdebug.h
libs4c/usb/lpcusb/lpc.c
libs4c/usb/lpcusb/lpcusb.c
libs4c/usb/more/usb/usb_loader.h
libs4c/usb/pdiusb/pdiusb.c
libs4c/usb/pdiusb/usb/pdiusb.h
# -*- makefile -*-
- SUBDIRS = $(ALL_OMK_SUBDIRS)
-SUBDIRS = hal iap
++SUBDIRS = hal iap boot ldscripts uart_zen
# -*- makefile -*-
- SUBDIRS = boot can lpcan lpcanvca pll pwm uart_zen uart-nozen ldscripts
+ SUBDIRS = hal iap
++SUBDIRS += boot can lpcan lpcanvca pll pwm uart_zen uart-nozen ldscripts
# -*- makefile -*-
++# -*- makefile -*-
- SUBDIRS = $(ALL_OMK_SUBDIRS)
-SUBDIRS = hal iap
++SUBDIRS = hal iap boot ldscripts pll pwm uart_zen
cmdproc_SOURCES = cmd_proc.c cmd_proc_run.c cmd_io.c cmd_io_line.c cmdio_std.c cmdio_std_line.c \
cmdio_std_file.c
-include_HEADERS = cmd_proc.h
+include_HEADERS = cmd_proc.h cmdio_std.h
- ifneq ($(CONFIG_CMDPROC_TEST),n)
+ ifeq ($(CONFIG_OC_CMDPROC_TEST),y)
bin_PROGRAMS = cmdproc_test
cmdproc_test_SOURCES = cmdproc_test.c
cmdproc_test_LIBS = cmdproc misc
projects / sysless.git / commitdiff