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/evb64260 | |
| 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/evb64260')
| -rw-r--r-- | board/evb64260/Kconfig | 23 | ||||
| -rw-r--r-- | board/evb64260/MAINTAINERS | 12 |
2 files changed, 35 insertions, 0 deletions
diff --git a/board/evb64260/Kconfig b/board/evb64260/Kconfig new file mode 100644 index 0000000000..f7f86c9e87 --- /dev/null +++ b/board/evb64260/Kconfig @@ -0,0 +1,23 @@ +if TARGET_P3G4 + +config SYS_BOARD + string + default "evb64260" + +config SYS_CONFIG_NAME + string + default "P3G4" + +endif + +if TARGET_ZUMA + +config SYS_BOARD + string + default "evb64260" + +config SYS_CONFIG_NAME + string + default "ZUMA" + +endif diff --git a/board/evb64260/MAINTAINERS b/board/evb64260/MAINTAINERS new file mode 100644 index 0000000000..f8307ccf51 --- /dev/null +++ b/board/evb64260/MAINTAINERS @@ -0,0 +1,12 @@ +EVB64260 BOARD +M: Wolfgang Denk <wd@denx.de> +S: Maintained +F: board/evb64260/ +F: include/configs/P3G4.h +F: configs/P3G4_defconfig + +ZUMA BOARD +M: Nye Liu <nyet@zumanetworks.com> +S: Orphan (since 2014-04) +F: include/configs/ZUMA.h +F: configs/ZUMA_defconfig |