diff --git a/Kconfig b/Kconfig index 9334c7799..9e92064a1 100644 --- a/Kconfig +++ b/Kconfig @@ -62,13 +62,6 @@ config ARM_HYPERVISOR_SUPPORT help Support for ARM1136JF-S - config ARM926EJ_S - bool "ARM926EJ-S" - depends on ARCH_ARM - select ARCH_ARM_V5 - help - Support for ARM926EJ_S - config ARM_CORTEX_A8 bool "Cortex A8" depends on ARCH_ARM @@ -104,13 +97,6 @@ config ARM_HYPERVISOR_SUPPORT help Support for the KZM platform - config PLAT_INTEGRATORCP - bool "IntegratorCP Platform" - depends on ARCH_ARM - depends on ARM926EJ_S - help - Support for the IntegratorCP platform - config PLAT_OMAP3 bool "OMAP3 (BeagleBoard)" depends on ARCH_ARM diff --git a/Makefile b/Makefile index 0d9de5aa8..67d312300 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,7 @@ default: all ### Paths ############################################################ -PYTHONPATH = ${SOURCE_ROOT}/tools +PYTHONPATH := ${PYTHONPATH}:${SOURCE_ROOT}/tools export PYTHONPATH vpath %.c ${SOURCE_ROOT} diff --git a/README b/README deleted file mode 100644 index d793f687b..000000000 --- a/README +++ /dev/null @@ -1,35 +0,0 @@ -# -# Copyright 2014, General Dynamics C4 Systems -# -# This software may be distributed and modified according to the terms of -# the GNU General Public License version 2. Note that NO WARRANTY is provided. -# See "LICENSE_GPLv2.txt" for details. -# -# @TAG(GD_GPL) -# - -'make' instructions -=================== - -tl;dr: TOOLPREFIX=arm-none-eabi- ARCH=arm PLAT=imx31 ARMV=armv6 \ - CPU=arm1136jf-s make - -The kernel source requires a cross-compiler for the target architecture. To -build using make, follow these instructions: - - * Ensure that the appropriate cross-compiler is installed. - - * Set the TOOLPREFIX environment variable to your cross-compiler's prefix. E.g. - arm-none-eabi-. - - * Set the ARCH, PLAT, ARMV and CPU variables for the intended target - architecture and platform, chosen from the following lists: - - ARCH PLAT ARMV CPU - ------------------------------------ - arm imx31 armv6 arm1136jf-s - arm omap3 armv7-a cortex-a8 - arm am335x armv7-a cortex-a8 - ia32 pc99 - - * For a debug build, append "DEBUG=y". diff --git a/README.md b/README.md new file mode 100644 index 000000000..1dbf74ca2 --- /dev/null +++ b/README.md @@ -0,0 +1,72 @@ + + +The seL4 Repository +=================== + +This repository contains the source code of seL4 microkernel. + +For details about the seL4 microkernel, including details about the proof, +please see the [`sel4.systems`][1] website and associated [FAQ][2]. + +This repository is usually not used in isolation, but as part of the build +system in a larger project. + + [1]: http://sel4.systems/ + [2]: http://sel4.systems/FAQ/ + + +Repository Overview +------------------- + + * `include` and `src`: C and ASM source code of seL4 + * `tools`: build tools + * `haskell`: Haskell model of the seL4 kernel, + kept in sync with the C version. + * `libsel4`: C bindings for the seL4 ABI + * `manual`: LaTeX sourced of the seL4 reference manual + + +Build Instructions +------------------ + +tl;dr: + + TOOLPREFIX=arm-none-eabi- ARCH=arm PLAT=imx31 ARMV=armv6 CPU=arm1136jf-s \ + make + +The kernel source requires a cross-compiler for the target architecture. To +build using `make`, follow these instructions: + + * Ensure that the appropriate cross-compiler for your target + architecture is installed. + + * Set the `TOOLPREFIX` environment variable to your cross-compiler's + prefix. E.g. `arm-none-eabi-`. + + * Set the `ARCH`, `PLAT`, `ARMV` and `CPU` variables for the intended target + architecture and platform, chosen from the following lists: + + ARCH | PLAT | ARMV | CPU + -----|--------|---------|----------- + arm | imx31 | armv6 | arm1136jf-s + arm | omap3 | armv7-a | cortex-a8 + arm | am335x | armv7-a | cortex-a8 + ia32 | pc99 | | + + * For a debug build, append `DEBUG=y`. + + +License +======= + +The files in this repository are released under standard open source licenses. +Please see the individual file headers and `LICENSE_GPLv2.txt` and +`LICENSE_BSD2.txt` files for details. diff --git a/manual/VERSION b/manual/VERSION index 5625e59da..7e32cd569 100644 --- a/manual/VERSION +++ b/manual/VERSION @@ -1 +1 @@ -1.2 +1.3