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/cray | |
| parent | f93f21906e374d46c6abfbdf4eb9cb1ab51b6384 (diff) | |
| parent | 1899fac925eda817e12234aef3d01d354788662e (diff) | |
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/cray')
| -rw-r--r-- | board/cray/L1/Kconfig | 15 | ||||
| -rw-r--r-- | board/cray/L1/MAINTAINERS | 6 |
2 files changed, 21 insertions, 0 deletions
diff --git a/board/cray/L1/Kconfig b/board/cray/L1/Kconfig new file mode 100644 index 0000000000..fa9a7022c1 --- /dev/null +++ b/board/cray/L1/Kconfig @@ -0,0 +1,15 @@ +if TARGET_CRAYL1 + +config SYS_BOARD + string + default "L1" + +config SYS_VENDOR + string + default "cray" + +config SYS_CONFIG_NAME + string + default "CRAYL1" + +endif diff --git a/board/cray/L1/MAINTAINERS b/board/cray/L1/MAINTAINERS new file mode 100644 index 0000000000..e93819ecfa --- /dev/null +++ b/board/cray/L1/MAINTAINERS @@ -0,0 +1,6 @@ +L1 BOARD +M: David Updegraff <dave@cray.com> +S: Orphan (since 2014-03) +F: board/cray/L1/ +F: include/configs/CRAYL1.h +F: configs/CRAYL1_defconfig |