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/zeus | |
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/zeus')
-rw-r--r-- | board/zeus/Kconfig | 11 | ||||
-rw-r--r-- | board/zeus/MAINTAINERS | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/board/zeus/Kconfig b/board/zeus/Kconfig new file mode 100644 index 0000000..5678694 --- /dev/null +++ b/board/zeus/Kconfig @@ -0,0 +1,11 @@ +if TARGET_ZEUS + +config SYS_BOARD + string + default "zeus" + +config SYS_CONFIG_NAME + string + default "zeus" + +endif diff --git a/board/zeus/MAINTAINERS b/board/zeus/MAINTAINERS new file mode 100644 index 0000000..3118710 --- /dev/null +++ b/board/zeus/MAINTAINERS @@ -0,0 +1,6 @@ +ZEUS BOARD +M: Stefan Roese <sr@denx.de> +S: Maintained +F: board/zeus/ +F: include/configs/zeus.h +F: configs/zeus_defconfig |