diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-08-11 10:21:03 +0200 |
| commit | e82abaeb7f2a0833fccf90460c48b9f2100258f8 (patch) | |
| tree | de701f5c90b7373966412d566b5c00d3837954bc /board/omicron/calimain | |
| parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
| parent | 1899fac925eda817e12234aef3d01d354788662e (diff) | |
| download | u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.zip u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.gz u-boot-imx-e82abaeb7f2a0833fccf90460c48b9f2100258f8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
boards.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board/omicron/calimain')
| -rw-r--r-- | board/omicron/calimain/Kconfig | 23 | ||||
| -rw-r--r-- | board/omicron/calimain/MAINTAINERS | 7 |
2 files changed, 30 insertions, 0 deletions
diff --git a/board/omicron/calimain/Kconfig b/board/omicron/calimain/Kconfig new file mode 100644 index 0000000..923af8a --- /dev/null +++ b/board/omicron/calimain/Kconfig @@ -0,0 +1,23 @@ +if TARGET_CALIMAIN + +config SYS_CPU + string + default "arm926ejs" + +config SYS_BOARD + string + default "calimain" + +config SYS_VENDOR + string + default "omicron" + +config SYS_SOC + string + default "davinci" + +config SYS_CONFIG_NAME + string + default "calimain" + +endif diff --git a/board/omicron/calimain/MAINTAINERS b/board/omicron/calimain/MAINTAINERS new file mode 100644 index 0000000..f6e37a2 --- /dev/null +++ b/board/omicron/calimain/MAINTAINERS @@ -0,0 +1,7 @@ +CALIMAIN BOARD +M: Manfred Rudigier <manfred.rudigier@omicron.at> +M: Christian Riesch <christian.riesch@omicron.at> +S: Maintained +F: board/omicron/calimain/ +F: include/configs/calimain.h +F: configs/calimain_defconfig |