Changeset 0ab362c in mainline

Timestamp:

2012-11-22T14:36:04Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e32720ff

Parents:

1f7753a (diff), 0f2c80a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge support for BeagleBoard-xM (armv7).

Most of the changes outside arm arch are pio_* stuff (addition of pio_trace capability, header consolidation)

Files:

• HelenOS.config (modified) (view diffs)
• boot/Makefile.uboot (modified) (view diffs)
• boot/arch/arm32/Makefile.inc (modified) (view diffs)
• boot/arch/arm32/include/arch.h (modified) (view diffs)
• boot/arch/arm32/include/main.h (modified) (view diffs)
• boot/arch/arm32/include/mm.h (modified) (view diffs)
• boot/arch/arm32/src/mm.c (modified) (view diffs)
• boot/arch/arm32/src/putchar.c (modified) (view diffs)
• defaults/arm32/beagleboardxm/Makefile.config (added)
• defaults/arm32/gta02/Makefile.config (modified) (view diffs)
• kernel/arch/arm32/Makefile.inc (modified) (view diffs)
• kernel/arch/arm32/_link.ld.in (modified) (view diffs)
• kernel/arch/arm32/include/asm.h (modified) (view diffs)
• kernel/arch/arm32/include/barrier.h (modified) (view diffs)
• kernel/arch/arm32/include/cpu.h (modified) (view diffs)
• kernel/arch/arm32/include/mach/beagleboardxm/beagleboardxm.h (added)
• kernel/arch/arm32/include/machine_func.h (modified) (view diffs)
• kernel/arch/arm32/include/mm/frame.h (modified) (view diffs)
• kernel/arch/arm32/include/mm/page.h (modified) (view diffs)
• kernel/arch/arm32/include/mm/page_armv4.h (added)
• kernel/arch/arm32/include/mm/page_armv6.h (added)
• kernel/arch/arm32/include/mm/page_fault.h (modified) (view diffs)
• kernel/arch/arm32/include/regutils.h (modified) (view diffs)
• kernel/arch/arm32/src/arm32.c (modified) (view diffs)
• kernel/arch/arm32/src/cpu/cpu.c (modified) (view diffs)
• kernel/arch/arm32/src/exception.c (modified) (view diffs)
• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (added)
• kernel/arch/arm32/src/machine_func.c (modified) (view diffs)
• kernel/arch/arm32/src/mm/page.c (modified) (view diffs)
• kernel/arch/arm32/src/mm/page_fault.c (modified) (view diffs)
• kernel/genarch/Makefile.inc (modified) (view diffs)
• kernel/genarch/include/drivers/amdm37x_dispc/amdm37x_dispc.h (added)
• kernel/genarch/include/drivers/amdm37x_gpt/amdm37x_gpt.h (added)
• kernel/genarch/include/drivers/amdm37x_irc/amdm37x_irc.h (added)
• kernel/genarch/include/drivers/amdm37x_uart/amdm37x_uart.h (added)
• kernel/genarch/src/drivers/amdm37x_uart/amdm37x_uart.c (added)
• kernel/generic/src/console/cmd.c (modified) (view diffs)
• kernel/generic/src/console/kconsole.c (modified) (view diffs)
• kernel/generic/src/mm/as.c (modified) (view diffs)
• tools/mkuimage.py (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/tester/mm/common.c (modified) (view diffs)
• uspace/app/tester/mm/mapping1.c (modified) (view diffs)
• uspace/drv/bus/isa/i8237.c (modified) (view diffs)
• uspace/drv/bus/pci/pciintel/pci.c (modified) (view diffs)
• uspace/drv/bus/usb/ehci/ehci.ma (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci.ma (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci_regs.h (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hc.c (modified) (view diffs)
• uspace/drv/bus/usb/uhci/hc.h (modified) (view diffs)
• uspace/drv/bus/usb/uhcirh/port.c (modified) (view diffs)
• uspace/drv/char/i8042/i8042.c (modified) (view diffs)
• uspace/drv/char/ns8250/ns8250.c (modified) (view diffs)
• uspace/drv/infrastructure/rootamdm37x/Makefile (added)
• uspace/drv/infrastructure/rootamdm37x/amdm37x.c (added)
• uspace/drv/infrastructure/rootamdm37x/amdm37x.h (added)
• uspace/drv/infrastructure/rootamdm37x/cm/clock_control.h (added)
• uspace/drv/infrastructure/rootamdm37x/cm/core.h (added)
• uspace/drv/infrastructure/rootamdm37x/cm/iva2.h (added)
• uspace/drv/infrastructure/rootamdm37x/cm/mpu.h (added)
• uspace/drv/infrastructure/rootamdm37x/cm/usbhost.h (added)
• uspace/drv/infrastructure/rootamdm37x/prm/clock_control.h (added)
• uspace/drv/infrastructure/rootamdm37x/prm/global_reg.h (added)
• uspace/drv/infrastructure/rootamdm37x/prm/usbhost.h (added)
• uspace/drv/infrastructure/rootamdm37x/rootamdm37x.c (added)
• uspace/drv/infrastructure/rootamdm37x/rootamdm37x.ma (added)
• uspace/drv/infrastructure/rootamdm37x/uhh.h (added)
• uspace/drv/infrastructure/rootamdm37x/usbtll.h (added)
• uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
• uspace/drv/nic/ne2k/dp8390.c (modified) (view diffs)
• uspace/drv/nic/rtl8139/defs.h (modified) (view diffs)
• uspace/drv/nic/rtl8139/driver.c (modified) (view diffs)
• uspace/drv/time/cmos-rtc/cmos-rtc.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/arch/abs32le/include/ddi.h (modified) (view diffs)
• uspace/lib/c/arch/arm32/Makefile.common (modified) (view diffs)
• uspace/lib/c/arch/arm32/include/ddi.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/ddi.h (modified) (view diffs)
• uspace/lib/c/arch/ia64/include/ddi.h (modified) (view diffs)
• uspace/lib/c/arch/ia64/src/ddi.c (modified) (view diffs)
• uspace/lib/c/arch/mips32/include/ddi.h (modified) (view diffs)
• uspace/lib/c/arch/mips64/include/ddi.h (modified) (view diffs)
• uspace/lib/c/arch/ppc32/include/ddi.h (modified) (view diffs)
• uspace/lib/c/arch/sparc64/include/ddi.h (modified) (view diffs)
• uspace/lib/c/generic/ddi.c (modified) (view diffs)
• uspace/lib/c/generic/malloc.c (modified) (view diffs)
• uspace/lib/c/generic/pio_trace.c (added)
• uspace/lib/c/include/ddi.h (modified) (view diffs)
• uspace/lib/c/include/macros.h (modified) (view diffs)
• uspace/lib/usbdev/include/usb/dev/request.h (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• uspace/srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• uspace/srv/hid/input/port/pl050.c (modified) (view diffs)
• uspace/srv/hid/output/port/ega.c (modified) (view diffs)
• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• uspace/srv/hw/irc/i8259/i8259.c (modified) (view diffs)